Author: rjung
Date: Mon Nov 19 12:26:02 2007
New Revision: 596433
URL: http://svn.apache.org/viewvc?rev=596433&view=rev
Log:
Merge is always done before post_config, so we
can use jk_mount_copy_all to set mountcopy during merge,
which simplifies mount copy logic.
JkMountCopy All should be weaker than JkMountCopy Off,
i.e. a vhost with JkMountCopy Off should not inherit
the mounts, even if JkMountCopy All is globally set.
Port from r593921 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=596433&r1=596432&r2=596433&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:26:02
2007
@@ -2322,6 +2322,9 @@
}
}
+ if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) {
+ overrides->mountcopy = JK_TRUE;
+ }
if (overrides->uri_to_context) {
/* jk_map_copy() preserves existing entries in overrides map */
if (jk_map_copy(base->uri_to_context, overrides->uri_to_context) ==
JK_FALSE) {
@@ -2523,7 +2526,7 @@
}
}
else {
- if (sconf->mountcopy == JK_TRUE || jk_mount_copy_all ==
JK_TRUE) {
+ if (sconf->mountcopy == JK_TRUE) {
sconf->uw_map = conf->uw_map;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
