From: Jim Jagielski <jim@apache.org>
Date: Tue, 8 Jul 2014 13:14:34 +0000 (+0000)
Subject: Merge r1572561 from trunk:
X-Git-Tag: 2.4.10~68
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=687df1667d83ab9cb091eeff8eb00020073c6e6d;p=apache

Merge r1572561 from trunk:

Avoid useless functions calls.

Submitted by: ylavic
Reviewed/backported by: jim


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

diff --git a/STATUS b/STATUS
index 53e5ff733c..703fbd349a 100644
--- a/STATUS
+++ b/STATUS
@@ -100,11 +100,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_http: Avoid useless functions calls.
-     trunk patch: http://svn.apache.org/r1572561
-     2.4.x patch: trunk works
-     +1: ylavic, covener, jim
-
    * mod_proxy: When ping/pong is configured for a worker, don't send or forward
                 "100 Continue" (interim) response to the client if it does not
                 expect one.
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index da18893a12..141452bf21 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1745,7 +1745,6 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
 #endif
                     /* sanity check */
                     if (APR_BRIGADE_EMPTY(bb)) {
-                        apr_brigade_cleanup(bb);
                         break;
                     }
 
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 4f8ee5d5d6..5db7f9c514 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2285,6 +2285,7 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
                                             conn->pool);
             }
             socket_cleanup(conn);
+            conn->close = 0;
         }
         if (will_reuse) {
             /*