]> git.ipfire.org Git - thirdparty/apache/httpd.git/commit
mod_proxy: pconf vs pchild consistency, and correctness in ONE_PROCESS mode.
authorYann Ylavic <ylavic@apache.org>
Mon, 23 Nov 2020 11:03:45 +0000 (11:03 +0000)
committerYann Ylavic <ylavic@apache.org>
Mon, 23 Nov 2020 11:03:45 +0000 (11:03 +0000)
commit79739abe6661dd7a2bebb731c7b7c1478233f1da
treebb5d5873efe92ceca1c9577a62f61867e43ff9ff
parent7594af85fefb95f6996518e4d747323c54d37aee
mod_proxy: pconf vs pchild consistency, and correctness in ONE_PROCESS mode.

Consistently use pconf for ap_proxy_define_{worker,balancer}() and pchild for
ap_proxu_initialize_{worker,balancer}() in mod_proxy [child_]init code.

pchild is needed in _initialize() for mutexes/shms' child_init and cleanup,
and to avoid a crash on shutdown (i.e. ap_terminate) in ONE_PROCESS mode,
where worker->cp->pool is destroyed twice, let's register conn_pool_cleanup()
as a pre_cleanup of pchild.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1883744 13f79535-47bb-0310-9956-ffa450edef68
modules/proxy/mod_proxy.c
modules/proxy/mod_proxy_balancer.c
modules/proxy/proxy_util.c