summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorStefan Eissing <icing@apache.org>2022-02-24 16:59:31 +0000
committerStefan Eissing <icing@apache.org>2022-02-24 16:59:31 +0000
commit18ddb6670b86805570f74b217a2206c66a3b6413 (patch)
tree4ac80b8972e099bf6bb5e70a0738a8bc8502271f /server
parent27e5fe3770b536cba33d633b0c162755050bb4a1 (diff)
downloadhttpd-18ddb6670b86805570f74b217a2206c66a3b6413.tar.gz
*) core/prefork: run new hook `child_stopped` only on clean exit.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1898381 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server')
-rw-r--r--server/mpm/prefork/prefork.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index d1e17b26f0..71532d611c 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -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.