diff options
| author | Joe Orton <jorton@apache.org> | 2020-04-16 20:22:43 +0200 |
|---|---|---|
| committer | Joe Orton <jorton@apache.org> | 2020-04-16 20:22:43 +0200 |
| commit | 504c211981c4a2aab0b9f00c9b86dc3a2a67a08e (patch) | |
| tree | 77a9be3551284d11a028879638146a1e2a0958c6 /server/mpm/prefork/prefork.c | |
| parent | Allow failures for the gcc9 build since the repo seems to have broken deps. (diff) | |
| download | apache2-504c211981c4a2aab0b9f00c9b86dc3a2a67a08e.tar.xz apache2-504c211981c4a2aab0b9f00c9b86dc3a2a67a08e.zip | |
* 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
Diffstat (limited to '')
| -rw-r--r-- | server/mpm/prefork/prefork.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |