Author: rjung Date: Sun Nov 11 08:00:07 2007 New Revision: 593916 URL: http://svn.apache.org/viewvc?rev=593916&view=rev Log: Add two comments, how me merge.
Modified: tomcat/connectors/trunk/jk/native/apache-2.0/mod_jk.c 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=593916&r1=593915&r2=593916&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 11 08:00:07 2007 @@ -2434,6 +2434,7 @@ if (base->envvars) { if (overrides->envvars && overrides->envvars_has_own) { +/* merge_apr_table() preserves existing entries in overrides table */ merge_apr_table(base->envvars, overrides->envvars); merge_apr_table(base->envvars_def, overrides->envvars_def); } @@ -2445,6 +2446,7 @@ } 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) { jk_error_exit(APLOG_MARK, APLOG_EMERG, overrides->s, p, "Memory error"); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]