summaryrefslogtreecommitdiffstats
path: root/modules/proxy/mod_proxy.c
diff options
context:
space:
mode:
authorRuediger Pluem <rpluem@apache.org>2012-03-19 15:51:47 +0100
committerRuediger Pluem <rpluem@apache.org>2012-03-19 15:51:47 +0100
commit0dc16bb55e1b87b1a1a30eac4b55776d46f78b75 (patch)
tree190817a09065dfc890261004b9d5259c7f97fa6f /modules/proxy/mod_proxy.c
parent* Correctly save the reverse proxy worker in all virtual host proxy configs. (diff)
downloadapache2-0dc16bb55e1b87b1a1a30eac4b55776d46f78b75.tar.xz
apache2-0dc16bb55e1b87b1a1a30eac4b55776d46f78b75.zip
* Readd the reverse assignment to avoid segfaults in ap_proxy_initialize_worker
PR: 52935 Obtained from: Petter Berntsen <petterb gmail.com> git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1302483 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to '')
-rw-r--r--modules/proxy/mod_proxy.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index b79feae80b..8d289552d3 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2461,6 +2461,7 @@ static void child_init(apr_pool_t *p, server_rec *s)
ap_proxy_hashfunc(reverse->s->name, PROXY_HASHFUNC_FNV);
/* Do not disable worker in case of errors */
reverse->s->status |= PROXY_WORKER_IGNORE_ERRORS;
+ conf->reverse = reverse;
ap_proxy_initialize_worker(conf->reverse, s, conf->pool);
/* Disable address cache for generic reverse worker */
reverse->s->is_address_reusable = 0;