diff options
| author | Yann Ylavic <ylavic@apache.org> | 2017-09-28 13:31:57 +0200 |
|---|---|---|
| committer | Yann Ylavic <ylavic@apache.org> | 2017-09-28 13:31:57 +0200 |
| commit | 1ebc68400d1239d9cb0a289e0fb200682a8717d3 (patch) | |
| tree | 8a6ab820feae56e60ae24a3e4f6f114f84a0b76c /os | |
| parent | core, MPMs unix: follow up to r1809881. (diff) | |
| download | apache2-1ebc68400d1239d9cb0a289e0fb200682a8717d3.tar.xz apache2-1ebc68400d1239d9cb0a289e0fb200682a8717d3.zip | |
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
Diffstat (limited to 'os')
| -rw-r--r-- | os/unix/unixd.c | 4 |
1 files changed, 4 insertions, 0 deletions
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; |