From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 28 Sep 2017 11:31:57 +0000 (+0000)
Subject: MPMs unix: follow up to r1809881 and r1809973.
X-Git-Tag: 2.5.0-alpha~90
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1ebc68400d1239d9cb0a289e0fb200682a8717d3;p=apache

MPMs unix: follow up to r1809881 and r1809973.

unset_signals() is called when ap_pglobal is destroyed too.



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

diff --git a/os/unix/unixd.c b/os/unix/unixd.c
index b17b6ac2e3..7f71d1a642 100644
--- a/os/unix/unixd.c
+++ b/os/unix/unixd.c
@@ -497,6 +497,10 @@ static void sig_restart(int sig)
 
 static apr_status_t unset_signals(void *unused)
 {
+    if (!retained_data) {
+        /* Main process (ap_pglobal) is dying */
+        return APR_SUCCESS;
+    }
     retained_data->shutdown_pending = retained_data->restart_pending = 0;
     retained_data->was_graceful = !retained_data->is_ungraceful;
     retained_data->is_ungraceful = 0;