You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/01/29 16:52:19 UTC
svn commit: r1822535 - in /httpd/httpd/trunk/server/mpm: event/event.c
prefork/prefork.c worker/worker.c
Author: ylavic
Date: Mon Jan 29 16:52:19 2018
New Revision: 1822535
URL: http://svn.apache.org/viewvc?rev=1822535&view=rev
Log:
Revert r1814112, it does not work for threaded MPMs.
Modified:
httpd/httpd/trunk/server/mpm/event/event.c
httpd/httpd/trunk/server/mpm/prefork/prefork.c
httpd/httpd/trunk/server/mpm/worker/worker.c
Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1822535&r1=1822534&r2=1822535&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Mon Jan 29 16:52:19 2018
@@ -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);
Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1822535&r1=1822534&r2=1822535&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Mon Jan 29 16:52:19 2018
@@ -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);
Modified: httpd/httpd/trunk/server/mpm/worker/worker.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/worker/worker.c?rev=1822535&r1=1822534&r2=1822535&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/worker/worker.c (original)
+++ httpd/httpd/trunk/server/mpm/worker/worker.c Mon Jan 29 16:52:19 2018
@@ -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);