From: Yann Ylavic <ylavic@apache.org>
Date: Fri, 11 Dec 2020 14:55:20 +0000 (+0000)
Subject: Merge r1876626 from trunk:
X-Git-Tag: 2.4.47~204
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=03b7224de00e33b3bd0b93a7f2c00a4e0183ef94;p=thirdparty%2Fapache%2Fhttpd.git

Merge r1876626 from trunk:

* server/mpm/prefork/prefork.c (prefork_pre_config): Use pconf as
  passed to the hook with ap_fatal_signal_child_setup, since
  prefork.c's pconf "global" is not set until the (later) open_logs
  hook, and if built as a DSO it may be reset inbetween.

* server/mpm/motorz/motorz.c (motorz_pre_config): Likewise.

[event and worker do not appear to have the same issue]


Submitted by: jorton
Reviewed by: https://lists.apache.org/thread.html/rc43315d87ac9bb92a6e0e4068d7680e7044df0a1640d514fd40f19fd%40%3Cdev.httpd.apache.org%3E


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1884320 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 9934cfc2e71..183ef938cd6 100644
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1263,7 +1263,7 @@ static int prefork_pre_config(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *ptemp
     if (retained->mpm->module_loads == 2) {
         if (!one_process && !foreground) {
             /* before we detach, setup crash handlers to log to errorlog */
-            ap_fatal_signal_setup(ap_server_conf, pconf);
+            ap_fatal_signal_setup(ap_server_conf, p /* == pconf */);
             rv = apr_proc_detach(no_detach ? APR_PROC_DETACH_FOREGROUND
                                            : APR_PROC_DETACH_DAEMONIZE);
             if (rv != APR_SUCCESS) {