Author: rjung
Date: Mon Nov 19 12:18:55 2007
New Revision: 596426
URL: http://svn.apache.org/viewvc?rev=596426&view=rev
Log:
Add two comments, how me merge.
Port from r593916 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=596426&r1=596425&r2=596426&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:18:55
2007
@@ -2308,6 +2308,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);
}
@@ -2319,6 +2320,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]
