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

* Introduce environment variable proxy-initial-not-pooled to avoid reusing

Browse Source 
pooled connections if the client connection is an initial connection.
  This avoids the "proxy: error reading status line from remote server"
  error caused by the race condition that the backend server closed the
  connection after the connection check on our side and before our data
  reached the backend. Yes, this downgrades performance, especially with
  HTTP/1.0 clients. Hence it is configurable and off by default.

PR: 37770


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@684351 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Ruediger Pluem
2008-08-09 21:33:09 +00:00
parent 20317fa86b
commit 0afe61c5bd
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -2,6 +2,10 @@
Changes with Apache 2.3.0 Changes with Apache 2.3.0
[ When backported to 2.2.x, remove entry from this file ] [ When backported to 2.2.x, remove entry from this file ]
*) mod_proxy_http: Introduce environment variable proxy-initial-not-pooled to
avoid reusing pooled connections if the client connection is an initial
connection. PR 37770. [Ruediger Pluem]
*) mod_proxy: Add connectiontimeout parameter for proxy workers in order to *) mod_proxy: Add connectiontimeout parameter for proxy workers in order to
be able to set the timeout for connecting to the backend separately. be able to set the timeout for connecting to the backend separately.
PR 45445. [Ruediger Pluem, rahul <rahul sun.com>] PR 45445. [Ruediger Pluem, rahul <rahul sun.com>]

13
modules/proxy/mod_proxy_http.c
View File

@@ -1927,6 +1927,19 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
ap_proxy_ssl_connection_cleanup(backend, r); ap_proxy_ssl_connection_cleanup(backend, r);
} }
/*
* In the case that we are handling a reverse proxy connection and this
* is not a request that is coming over an already kept alive connection
* with the client, do NOT reuse the connection to the backend, because
* we cannot forward a failure to the client in this case as the client
* does NOT expects this in this situation.
* Yes, this creates a performance penalty.
*/
if ((r->proxyreq == PROXYREQ_REVERSE) && (!c->keepalives)
&& (apr_table_get(r->subprocess_env, "proxy-initial-not-pooled"))) {
backend->close = 1;
}
/* Step One: Determine Who To Connect To */ /* Step One: Determine Who To Connect To */
if ((status = ap_proxy_determine_connection(p, r, conf, worker, backend, if ((status = ap_proxy_determine_connection(p, r, conf, worker, backend,
uri, &url, proxyname, uri, &url, proxyname,

5
modules/proxy/proxy_util.c
View File

@@ -2167,6 +2167,11 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
else { else {
conn->addr = worker->cp->addr; conn->addr = worker->cp->addr;
} }
/* Close a possible existing socket if we are told to do so */
if (conn->close) {
socket_cleanup(conn);
conn->close = 0;
}
if (err != APR_SUCCESS) { if (err != APR_SUCCESS) {
return ap_proxyerror(r, HTTP_BAD_GATEWAY, return ap_proxyerror(r, HTTP_BAD_GATEWAY,