Author: rjung
Date: Mon Nov 19 12:28:13 2007
New Revision: 596435
URL: http://svn.apache.org/viewvc?rev=596435&view=rev
Log:
Even if a vhost has private JkMounts, it should not always
inherit the mounts from the global server. Only inherit
if JkMountCopy indicates it.
Port from r593922 of apache-2.0/mod_jk.c.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
Modified: tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c?rev=596435&r1=596434&r2=596435&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Mon Nov 19 12:28:13
2007
@@ -2325,18 +2325,18 @@
if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) {
overrides->mountcopy = JK_TRUE;
}
- if (overrides->uri_to_context) {
+ if (overrides->uri_to_context && overrides->mountcopy == JK_TRUE) {
/* jk_map_copy() preserves existing entries in overrides map */
if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) ==
JK_FALSE) {
jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p,
"Memory error");
}
- if (overrides->mount_file_reload == JK_UNSET)
- overrides->mount_file_reload = base->mount_file_reload;
if (!overrides->mount_file)
overrides->mount_file = base->mount_file;
if (!overrides->alias_dir)
overrides->alias_dir = base->alias_dir;
}
+ if (overrides->mount_file_reload == JK_UNSET)
+ overrides->mount_file_reload = base->mount_file_reload;
if (overrides->strip_session == JK_UNSET)
overrides->strip_session = base->strip_session;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
