mturk 2005/04/29 23:02:19
Modified: jk/native/apache-2.0 mod_jk.c
Log:
Assure singleton call to wc_close.
Revision Changes Path
1.142 +6 -3 jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c
Index: mod_jk.c
===================================================================
RCS file: /home/cvs/jakarta-tomcat-connectors/jk/native/apache-2.0/mod_jk.c,v
retrieving revision 1.141
retrieving revision 1.142
diff -u -r1.141 -r1.142
--- mod_jk.c 28 Apr 2005 11:28:46 -0000 1.141
+++ mod_jk.c 30 Apr 2005 06:02:19 -0000 1.142
@@ -1996,12 +1996,13 @@
(jk_server_conf_t *) ap_get_module_config(s->module_config,
&jk_module);
- if (conf) {
+ if (conf && conf->worker_properties) {
/* On pool cleanup pass NULL for the jk_logger to
prevent segmentation faults on Windows because
we can't guarantee what order pools get cleaned
up between APR implementations. */
- wc_close(NULL);
+ if (conf->was_initialized)
+ wc_close(NULL);
if (conf->worker_properties)
jk_map_free(&conf->worker_properties);
if (conf->uri_to_context)
@@ -2010,6 +2011,8 @@
jk_map_free(&conf->automount);
if (conf->uw_map)
uri_worker_map_free(&conf->uw_map, NULL);
+ conf->was_initialized = JK_FALSE;
+ conf->worker_properties = NULL;
}
s = s->next;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
