www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-08 15:02:10 +03:00
Code Activity

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

Browse Source 
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
This commit is contained in:
Ruediger Pluem
2006-04-08 21:43:24 +00:00
parent 700a020e7d
commit bb7b54c59f
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -2,6 +2,9 @@
Changes with Apache 2.3.0 Changes with Apache 2.3.0
[Remove entries to the current 2.0 and 2.2 section below, when backported] [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. *) Default handler: Don't return output filter apr_status_t values.
PR 31759. [Jeff Trawick, Ruediger Pluem, Joe Orton] PR 31759. [Jeff Trawick, Ruediger Pluem, Joe Orton]

8
modules/proxy/proxy_util.c
View File

@@ -1870,11 +1870,11 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
conn->hostname = apr_pstrdup(conn->pool, uri->hostname); conn->hostname = apr_pstrdup(conn->pool, uri->hostname);
conn->port = uri->port; conn->port = uri->port;
} }
if (conn->sock) {
apr_socket_close(conn->sock);
conn->sock = NULL;
}
if (conn->connection) { if (conn->connection) {
if (conn->sock) {
apr_socket_close(conn->sock);
conn->sock = NULL;
}
apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup); apr_pool_cleanup_kill(conn->connection->pool, conn, connection_cleanup);
conn->connection = NULL; conn->connection = NULL;
} }