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

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1573357 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/STATUS b/STATUS
index d9d6e344e5862ada226807a4cb8ed050098608d3..1140a088f1e0cd536bc9876ac35eca616869ca3e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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.

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index e585a297ee39f45b88de5bb5b518c762087dbc2c..a4031640387ac67441d59cecdb52ef32dfa9602c 100644 (file)
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1716,6 +1716,7 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
                         continue;
                     }
                     else if (rv == APR_EOF) {
+                        backend->close = 1;
                         break;
                     }
                     else if (rv != APR_SUCCESS) {