mpm_unix(es): cleanup properly on exit in one_process mode.

We can't destroy ap_pglobal because clean_child_exit() runs in DSO which would
be unloaded under us, so use atexit() to defer the final apr_terminate().

[Reverted by 1822535]

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1814112 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 0bf2dbe7755236be660be7c5bd20e0e71a8b882f..d57e771c7e7a72aec6d2c6901a09df4e24a8df58 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -732,6 +732,7 @@ static void clean_child_exit(int code)
 
     if (one_process) {
         event_note_child_killed(/* slot */ 0, 0, 0);
+        atexit(apr_terminate);
     }
 
     exit(code);

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index f9b9933bd32cd6385d65b9eed5209f3e7caf414c..649cc97d63b7096777a80d607f2014e3f2324978 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -230,6 +230,7 @@ static void clean_child_exit(int code)
 
     if (one_process) {
         prefork_note_child_killed(/* slot */ 0, 0, 0);
+        atexit(apr_terminate);
     }
 
     ap_mpm_pod_close(my_bucket->pod);

diff --git a/server/mpm/worker/worker.c b/server/mpm/worker/worker.c
index 3b93f3ceac59d227893629c6c68fbd44911499cd..c87c003c7e5c7912b6c3bbaee41e028c9e089ecb 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -436,6 +436,7 @@ static void clean_child_exit(int code)
 
     if (one_process) {
         worker_note_child_killed(/* slot */ 0, 0, 0);
+        atexit(apr_terminate);
     }
 
     exit(code);