Author: rjung
Date: Sun Nov 25 04:15:31 2007
New Revision: 597974
URL: http://svn.apache.org/viewvc?rev=597974&view=rev
Log:
Revert r597870: we alraedy handle this case by sharing
the same uw_map in post_config.
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=597974&r1=597973&r2=597974&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 Sun Nov 25 04:15:31
2007
@@ -2407,13 +2407,6 @@
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=597974&r1=597973&r2=597974&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 Sun Nov 25 04:15:31
2007
@@ -2543,13 +2543,6 @@
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]
