Author: rjung
Date: Sun Nov 11 11:22:23 2007
New Revision: 593943
URL: http://svn.apache.org/viewvc?rev=593943&view=rev
Log:
Undo revision 593927.
This produced a mem leak for vhosts with private JkMounts.
No idea why.
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=593943&r1=593942&r2=593943&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 11:22:23
2007
@@ -2322,8 +2322,14 @@
we can't guarantee what order pools get cleaned
up between APR implementations. */
wc_close(NULL);
- if (conf->uw_map)
- uri_worker_map_free(&conf->uw_map, NULL);
+ if (conf->uri_to_context) {
+ jk_map_free(&conf->uri_to_context);
+ /* We cannot have allocated uw_map
+ * unless we've allocated uri_to_context
+ */
+ if (conf->uw_map)
+ uri_worker_map_free(&conf->uw_map, NULL);
+ }
conf->was_initialized = JK_FALSE;
}
s = s->next;
@@ -2812,7 +2818,6 @@
sconf->uri_to_context,
sconf->log))
jk_error_exit(APLOG_MARK, APLOG_EMERG, srv,
srv->process->pool, "Memory error");
- jk_map_free(&sconf->uri_to_context);
if (sconf->options & JK_OPT_REJECTUNSAFE)
sconf->uw_map->reject_unsafe = 1;
else
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
