Merge r1302444, r1302483:

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

PR: 52935
Obtained from: Petter Berntsen <petterb gmail.com>
Committed by: rpluem
Reviewed by: covener, minfrin, sf

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1307825 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d85c757c89ac51d2bdb939eb799d9b28a70bf897..990a26d3aa8c6e9b89faf96377105ac9b1e20e12 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,9 @@ Changes with Apache 2.4.2
      envvars: Fix insecure handling of LD_LIBRARY_PATH that could lead to the
      current working directory to be searched for DSOs. [Stefan Fritsch]
 
+  *) mod_proxy: Correctly set up reverse proxy worker. PR 52935.
+     [Petter Berntsen <petterb gmail.com>]
+
   *) mod_sed: Don't define PATH_MAX to a potentially undefined value, causing
      compile problems on GNU hurd. [Stefan Fritsch]
 

diff --git a/STATUS b/STATUS
index fbdaa51e5ad3655d8e2b4b4de1127a9ecd7bdadb..a05aa61c1aff4fdd9b6470ce52ed9075b43de42c 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -95,12 +95,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
     2.4.x patch: http://people.apache.org/~fuankg/diffs/mpm_dso_exports.diff
     +1: fuankg, minfrin, trawick (Thanks!)
 
-  * proxy: Correctly save the reverse proxy worker in all virtual host proxy configs.
-    Trunk Patch: http://svn.apache.org/viewvc?rev=1302444&view=rev
-                 http://svn.apache.org/viewvc?rev=1302483&view=rev
-    2.4.x patch:  http://people.apache.org/~covener/patches/httpd-2.4.x-proxy_reverse.diff
-    +1: covener, minfrin, sf
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c
index ede29a1c8dccf95c757b11070c64f566c176106f..8d289552d3442edc88a14aed6d5b2bcb09ee915b 100644 (file)
--- a/modules/proxy/mod_proxy.c
+++ b/modules/proxy/mod_proxy.c
@@ -2466,6 +2466,7 @@ static void child_init(apr_pool_t *p, server_rec *s)
             /* Disable address cache for generic reverse worker */
             reverse->s->is_address_reusable = 0;
         }
+        conf->reverse = reverse;
         s = s->next;
     }
 }