[prev in list] [next in list] [prev in thread] [next in thread] 

List:       apache-cvs
Subject:    svn commit: r1898381 - /httpd/httpd/trunk/server/mpm/prefork/prefork.c
From:       icing () apache ! org
Date:       2022-02-24 16:59:31
Message-ID: 20220224165931.574B317A244 () svn01-us-east ! apache ! org
[Download RAW message or body]

Author: icing
Date: Thu Feb 24 16:59:31 2022
New Revision: 1898381

URL: http://svn.apache.org/viewvc?rev=1898381&view=rev
Log:
  *) core/prefork: run new hook `child_stopped` only on clean exit.


Modified:
    httpd/httpd/trunk/server/mpm/prefork/prefork.c

Modified: httpd/httpd/trunk/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/prefork/prefork.c?rev=1898381&r1=1898380&r2=1898381&view=diff
 ==============================================================================
--- httpd/httpd/trunk/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/trunk/server/mpm/prefork/prefork.c Thu Feb 24 16:59:31 2022
@@ -225,12 +225,12 @@ static void clean_child_exit(int code)
     apr_signal(SIGTERM, SIG_IGN);
 
     retained->mpm->mpm_state = AP_MPMQ_STOPPING;
-    if (code == 0) {
-        ap_run_child_stopping(pchild, 0);
-    }
 
     if (pchild) {
-        ap_run_child_stopped(pchild, 0);
+        if (code == 0) {
+            ap_run_child_stopping(pchild, 0);
+            ap_run_child_stopped(pchild, 0);
+        }
         apr_pool_destroy(pchild);
         /*
          * Be safe in case someone still uses afterwards or we get here again.


[prev in list] [next in list] [prev in thread] [next in thread]