From: Ruediger Pluem <rpluem@apache.org>
Date: Wed, 18 Mar 2020 10:53:06 +0000 (+0000)
Subject: * modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Clear any
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1582
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2163a01bdcd93147c5ccdd8809d8ae1a85d5ec54;p=thirdparty%2Fapache%2Fhttpd.git

* modules/proxy/mod_proxy_http.c (ap_proxy_http_process_response): Clear any
  possible returned buckets in the brigade in the error case. As we want to
  close the connection anyway there is no sensible content we could still
  sent and hence doing the needed life time transformation of the buckets
  would be a waste.

PR: 64234


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

diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
index d2eae1b44df..c5e1777623e 100644
--- a/modules/proxy/mod_proxy_http.c
+++ b/modules/proxy/mod_proxy_http.c
@@ -1787,6 +1787,7 @@ int ap_proxy_http_process_response(proxy_http_req_t *req)
                          * through a response, our only option is to
                          * disconnect the client too.
                          */
+                        apr_brigade_cleanup(bb);
                         e = ap_bucket_error_create(HTTP_GATEWAY_TIME_OUT, NULL,
                                 r->pool, c->bucket_alloc);
                         APR_BRIGADE_INSERT_TAIL(bb, e);