]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
Merge r1876626 from trunk:
authorYann Ylavic <ylavic@apache.org>
Fri, 11 Dec 2020 14:55:20 +0000 (14:55 +0000)
committerYann Ylavic <ylavic@apache.org>
Fri, 11 Dec 2020 14:55:20 +0000 (14:55 +0000)
commit03b7224de00e33b3bd0b93a7f2c00a4e0183ef94
tree4d1a573c58b23a3563a3b6f286ee0bc7373fd488
parent4601fa3ddb601cc378ef0f7d57dc746cc49b3b30
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
server/mpm/prefork/prefork.c