You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2014/03/02 21:17:14 UTC
svn commit: r1573357 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/proxy/mod_proxy_http.c
Author: jim
Date: Sun Mar 2 20:17:14 2014
New Revision: 1573357
URL: http://svn.apache.org/r1573357
Log:
Merge r1568404 from trunk:
mod_proxy_http: don't recycle backend connections known to be closed (eg. EOS by close).
This saves a useless ap_is_socket_connected() call when reused.
Submitted by: ylavic
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1568404
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1573357&r1=1573356&r2=1573357&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sun Mar 2 20:17:14 2014
@@ -98,11 +98,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy_http: Don't recycle backend connections known to be closed.
- trunk patch: http://svn.apache.org/r1568404
- 2.4.x patch: trunk works
- +1: ylavic, jim, mrumph
-
* mod_proxy: Cleanup the client to backend brigade before returning an error
(if any) to avoid buckets lifetime issues (backend connection's
pool destroyed before request's one). PR 50335.
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c?rev=1573357&r1=1573356&r2=1573357&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c Sun Mar 2 20:17:14 2014
@@ -1716,6 +1716,7 @@ apr_status_t ap_proxy_http_process_respo
continue;
}
else if (rv == APR_EOF) {
+ backend->close = 1;
break;
}
else if (rv != APR_SUCCESS) {