Author: rjung
Date: Mon Jan 21 02:35:46 2008
New Revision: 613833
URL: http://svn.apache.org/viewvc?rev=613833&view=rev
Log:
Only initialize extension attributes of uri worker map
if we actually have a map in the vhost.
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=613833&r1=613832&r2=613833&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 Jan 21 02:35:46
2008
@@ -2729,11 +2729,12 @@
"Error in creating the workers."
" Please consult your mod_jk log file '%s'.",
conf->log_file);
}
- uri_worker_map_ext(conf->uw_map, conf->log);
+ if (conf->uw_map)
+ uri_worker_map_ext(conf->uw_map, conf->log);
for (srv = s; srv; srv = srv->next) {
jk_server_conf_t *sconf = (jk_server_conf_t
*)ap_get_module_config(srv->module_config,
&jk_module);
- if (conf->uw_map != sconf->uw_map)
+ if (conf->uw_map != sconf->uw_map && sconf->uw_map)
uri_worker_map_ext(sconf->uw_map, sconf->log);
}
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=613833&r1=613832&r2=613833&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 Mon Jan 21 02:35:46
2008
@@ -2971,11 +2971,12 @@
conf->was_initialized = JK_TRUE;
if (init_jk(pconf, conf, s) == JK_FALSE)
return HTTP_INTERNAL_SERVER_ERROR;
- uri_worker_map_ext(conf->uw_map, conf->log);
+ if (conf->uw_map)
+ uri_worker_map_ext(conf->uw_map, conf->log);
for (srv = s; srv; srv = srv->next) {
jk_server_conf_t *sconf = (jk_server_conf_t
*)ap_get_module_config(srv->module_config,
&jk_module);
- if (conf->uw_map != sconf->uw_map)
+ if (conf->uw_map != sconf->uw_map && sconf->uw_map)
uri_worker_map_ext(sconf->uw_map, sconf->log);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
