Commit da57990e authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* 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
parent cb05cd65

CHANGES

+3 −0
Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,9 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]









  *) mod_proxy: Forward proxy requests created by mod_rewrite to the correct









     backend server. PR 39253. [Ruediger Pluem]

















  *) Default handler: Don't return output filter apr_status_t values.









     PR 31759.  [Jeff Trawick, Ruediger Pluem, Joe Orton]










































modules/proxy/proxy_util.c



+1
−1



























Changes for modules/proxy/proxy_util.c: 1 added line, 1 removed line.



Original line number
Diff line number
Diff line







@@ -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->connection) {









        if (conn->sock) {









            apr_socket_close(conn->sock);









            conn->sock = NULL;









        }









        if (conn->connection) {









            apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);









            conn->connection = NULL;









        }