Backport fix to PR#39253

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

diff --git a/CHANGES b/CHANGES
index 608fbaeba9a1a6dece08001689a2e2053346172d..223149ecdb827956e9adca9f52d0cd7296a9b82f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.2
 
+  *) mod_proxy: don't reuse a connection that may be to the wrong backend
+     PR 39253 [Ruediger Pluem]
+
   *) Default handler: Don't return output filter apr_status_t values.
      PR 31759.  [Jeff Trawick, Ruediger Pluem, Joe Orton]
 

diff --git a/STATUS b/STATUS
index 6bd7f81fe866b06f8235a554338af79c074daf4a..8b49be24d10b833ba0dea963569e5e488b6c9d00 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -74,14 +74,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_proxy: Forward proxy requests created by mod_rewrite to the correct
-                 backend server. PR 39253.
-        Trunk version of patch:
-          http://svn.apache.org/viewcvs?rev=392613&view=rev
-        2.2.x version of patch:
-          Trunk version works
-      +1: rpluem, trawick, jim
-
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index e28687ec25818a311176c179a987d2de3c779c36..104b465e68563c8321c51b9873cce6da946eca92 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1870,11 +1870,11 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
             conn->hostname = apr_pstrdup(conn->pool, uri->hostname);
             conn->port = uri->port;
         }
+        if (conn->sock) {
+            apr_socket_close(conn->sock);
+            conn->sock = NULL;
+        }
         if (conn->connection) {
-            if (conn->sock) {
-                apr_socket_close(conn->sock);
-                conn->sock = NULL;
-            }
             apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);
             conn->connection = NULL;
         }