From: Yann Ylavic <ylavic@apache.org>
Date: Mon, 29 Jan 2018 16:52:19 +0000 (+0000)
Subject: Revert r1814112, it does not work for threaded MPMs.
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2914
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b4b720bbfe373b41797c40d98861bb3cc2550674;p=thirdparty%2Fapache%2Fhttpd.git

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 fecaaf0d3db..0f78cfe825e 100644
--- 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 cd3de1d0e88..32555295fa2 100644
--- 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 1d475c3d096..21379543f8c 100644
--- 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);