You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2020/12/11 14:55:20 UTC
svn commit: r1884320 - in /httpd/httpd/branches/2.4.x: ./
server/mpm/prefork/prefork.c
Author: ylavic
Date: Fri Dec 11 14:55:20 2020
New Revision: 1884320
URL: http://svn.apache.org/viewvc?rev=1884320&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1876626
Modified: httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c?rev=1884320&r1=1884319&r2=1884320&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c (original)
+++ httpd/httpd/branches/2.4.x/server/mpm/prefork/prefork.c Fri Dec 11 14:55:20 2020
@@ -1263,7 +1263,7 @@ static int prefork_pre_config(apr_pool_t
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) {