From: Yann Ylavic <ylavic@apache.org>
Date: Thu, 27 Feb 2014 13:39:25 +0000 (+0000)
Subject: Avoid useless functions calls.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f9b9f42aa747f5057f1b5ae14892302fdb66cd6;p=thirdparty%2Fapache%2Fhttpd.git

Avoid useless functions calls.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1572561 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index cb81ddd0af7..9f7a6b40266 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1744,7 +1744,6 @@ int 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 73826691dd7..0cd27c8ea09 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2284,6 +2284,7 @@ ap_proxy_determine_connection(apr_pool_t *p, request_rec *r,
                                             conn->pool);
             }
             socket_cleanup(conn);
+            conn->close = 0;
         }
         if (will_reuse) {
             /*