From 504c211981c4a2aab0b9f00c9b86dc3a2a67a08e Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Thu, 16 Apr 2020 18:22:43 +0000 Subject: * 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] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1876626 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm/prefork/prefork.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'server/mpm/prefork/prefork.c') diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c index 99d570351b..732dabfe87 100644 --- a/server/mpm/prefork/prefork.c +++ b/server/mpm/prefork/prefork.c @@ -1269,7 +1269,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) { -- cgit v1.2.3