From 9e61a81629f2dfd43a6f4060171a5883cfae0453 Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Mon, 6 Aug 2007 17:08:10 +0000 Subject: [PATCH] Applied backport of r491907 -> http://people.apache.org/~chrisd/patches/mod_dbd_pools_groups/mpm_child_init-netware-2.2.x.patch git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@563195 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/netware/mpm_netware.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/server/mpm/netware/mpm_netware.c b/server/mpm/netware/mpm_netware.c index a6f896335f4..a8d0952f8da 100644 --- a/server/mpm/netware/mpm_netware.c +++ b/server/mpm/netware/mpm_netware.c @@ -191,6 +191,14 @@ static void clean_child_exit(int code, int worker_num, apr_pool_t *ptrans, NXThreadExit((void*)&code); } +/* proper cleanup when returning from ap_mpm_run() */ +static void mpm_main_cleanup(void) +{ + if (pmain) { + apr_pool_destroy(pmain); + } +} + AP_DECLARE(apr_status_t) ap_mpm_query(int query_code, int *result) { switch(query_code){ @@ -934,6 +942,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) apr_thread_yield(); } + mpm_main_cleanup(); return 1; } else { /* the only other way out is a restart */ @@ -956,6 +965,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s) printf ("\nRestarting...\n"); } + mpm_main_cleanup(); return 0; } -- 2.47.3