Author: rjung
Date: Wed Nov 22 08:12:00 2006
New Revision: 478208
URL: http://svn.apache.org/viewvc?view=rev&rev=478208
Log:
Inherit AliasDir and MountFile only if JkMountCopy is set.
Modified:
tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c
tomcat/connectors/trunk/jk/native/apache-2.0/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?view=diff&rev=478208&r1=478207&r2=478208
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-1.3/mod_jk.c Wed Nov 22 08:12:00
2006
@@ -2165,11 +2165,11 @@
copy_jk_map(p, overrides->s, base->uri_to_context,
overrides->uri_to_context);
copy_jk_map(p, overrides->s, base->automount, overrides->automount);
- overrides->mount_file = base->mount_file;
+ if (!overrides->mount_file)
+ overrides->mount_file = base->mount_file;
+ if (!overrides->alias_dir)
+ overrides->alias_dir = base->alias_dir;
}
-
- if (!overrides->alias_dir)
- overrides->alias_dir = base->alias_dir;
return overrides;
}
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c
URL:
http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c?view=diff&rev=478208&r1=478207&r2=478208
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Wed Nov 22 08:12:00
2006
@@ -2292,11 +2292,11 @@
copy_jk_map(p, overrides->s, base->uri_to_context,
overrides->uri_to_context);
copy_jk_map(p, overrides->s, base->automount, overrides->automount);
- overrides->mount_file = base->mount_file;
+ if (!overrides->mount_file)
+ overrides->mount_file = base->mount_file;
+ if (!overrides->alias_dir)
+ overrides->alias_dir = base->alias_dir;
}
-
- if (!overrides->alias_dir)
- overrides->alias_dir = base->alias_dir;
return overrides;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
