Revert r1814112, it does not work for threaded MPMs.

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

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index fecaaf0d3dbf4c1ff7ba13d845502a130efebf5d..0f78cfe825ece3d5b02b45cfae8ddd70b0f2339f 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -769,7 +769,6 @@ 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 cd3de1d0e88262c95b342d00d94748855a805d59..32555295fa2c184aecf46950a78047631bedde08 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -230,7 +230,6 @@ 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 1d475c3d09637732f82e1a212aa67db3d9708448..21379543f8cfef9fa195b562110492021df67675 100644 (file)
--- a/server/mpm/worker/worker.c
+++ b/server/mpm/worker/worker.c
@@ -436,7 +436,6 @@ static void clean_child_exit(int code)
 
     if (one_process) {
         worker_note_child_killed(/* slot */ 0, 0, 0);
-        atexit(apr_terminate);
     }
 
     exit(code);