* Check for an existing socket independant of an existing connection record.

  This ensures that requests handled by the '*' worker are sent to the correct
  backend server.

PR: 39253


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

1 files changed, 4 insertions, 4 deletions

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index e28687ec25..104b465e68 100644
--- 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;
         }