Author: rjung
Date: Sat Nov 24 08:08:14 2007
New Revision: 597870
URL: http://svn.apache.org/viewvc?rev=597870&view=rev
Log:
Add late alloc of uri_to_context in case we want
to inherit from base vhost, we have a private
conf in the new vhost, but no private mounts.
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?rev=597870&r1=597869&r2=597870&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 Sat Nov 24 08:08:14
2007
@@ -2325,6 +2325,13 @@
if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) {
overrides->mountcopy = JK_TRUE;
}
+ if (!overrides->uri_to_context &&
+ overrides->mountcopy == JK_TRUE &&
+ base->uri_to_context) {
+ if (!jk_map_alloc(&(overrides->uri_to_context))) {
+ jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p,
"JkMountCopy Memory error");
+ }
+ }
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) {
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?rev=597870&r1=597869&r2=597870&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c (original)
+++ tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c Sat Nov 24 08:08:14
2007
@@ -2461,6 +2461,13 @@
if (overrides->mountcopy == JK_UNSET && jk_mount_copy_all == JK_TRUE) {
overrides->mountcopy = JK_TRUE;
}
+ if (!overrides->uri_to_context &&
+ overrides->mountcopy == JK_TRUE &&
+ base->uri_to_context) {
+ if (!jk_map_alloc(&(overrides->uri_to_context))) {
+ jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p,
"JkMountCopy Memory error");
+ }
+ }
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) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
