danmil 01/02/16 21:24:01 Modified: src/native/apache1.3 Tag: tomcat_32 mod_jk.c Log: Free up all allocated memory during shutdown. Submitted by: Mike Anderson ([EMAIL PROTECTED]) Revision Changes Path No revision No revision 1.7.2.3 +14 -1 jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c Index: mod_jk.c =================================================================== RCS file: /home/cvs/jakarta-tomcat/src/native/apache1.3/Attic/mod_jk.c,v retrieving revision 1.7.2.2 retrieving revision 1.7.2.3 diff -u -r1.7.2.2 -r1.7.2.3 --- mod_jk.c 2000/10/05 06:32:21 1.7.2.2 +++ mod_jk.c 2001/02/17 05:24:00 1.7.2.3 @@ -862,6 +862,7 @@ #endif if(wc_open(init_map, conf->log)) { + map_free(&init_map); /* we don't need this any more so free it */ return; } } @@ -895,6 +896,18 @@ return DECLINED; } +static void exit_handler (server_rec *s, ap_pool *p) +{ + jk_server_conf_t *conf = + (jk_server_conf_t *)ap_get_module_config(s->module_config, &jk_module); + + wc_close(conf->log); + uri_worker_map_free(&(conf->uw_map), conf->log); + map_free(&(conf->uri_to_context)); + if (conf->log) + jk_close_file_logger(&(conf->log)); +} + static const handler_rec jk_handlers[] = { { JK_MAGIC_TYPE, jk_handler }, @@ -920,7 +933,7 @@ NULL, /* [10] logger */ NULL, /* [3] header parser */ NULL, /* apache child process initializer */ - NULL, /* apache child process exit/cleanup */ + exit_handler, /* apache child process exit/cleanup */ NULL /* [1] post read_request handling */ #ifdef EAPI /* --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, email: [EMAIL PROTECTED]