From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 19 Mar 2012 13:53:28 +0000 (+0000)
Subject: * Correctly save the reverse proxy worker in all virtual host proxy configs.
X-Git-Tag: 2.5.0-alpha~7338
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5bd03bd4ecad50d57566daf74f9022e3a78eb57;p=apache

* Correctly save the reverse proxy worker in all virtual host proxy configs.

PR: 52935
Obtained from: Petter Berntsen <petterb gmail.com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1302444 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index b1949fb621..9c60ba3542 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_proxy: Correctly set up reverse proxy worker. PR 52935.
+     [Petter Berntsen <petterb gmail.com>]
+
   *) core: Add filesystem paths to access denied / access failed messages
      AH00035 and AH00036. [Eric Covener]
 
diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index ede29a1c8d..b79feae80b 100644
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2461,11 +2461,11 @@ 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;
         }
+        conf->reverse = reverse;
         s = s->next;
     }
 }