altarch-user / rpms / httpd

Forked from rpms/httpd 2 years ago
Clone

Blame SOURCES/httpd-2.4.6-r1553540.patch

706609
# ./pullrev.sh 1553540
706609
706609
https://bugzilla.redhat.com/show_bug.cgi?id=1040447
706609
706609
http://svn.apache.org/viewvc?view=revision&revision=1553540
706609
706609
--- httpd-2.4.6/modules/proxy/mod_proxy_http.c
706609
+++ httpd-2.4.6/modules/proxy/mod_proxy_http.c
706609
@@ -710,7 +710,7 @@
706609
         force10 = 0;
706609
     }
706609
 
706609
-    header_brigade = apr_brigade_create(p, origin->bucket_alloc);
706609
+    header_brigade = apr_brigade_create(p, bucket_alloc);
706609
     rv = ap_proxy_create_hdrbrgd(p, header_brigade, r, p_conn,
706609
                                  worker, conf, uri, url, server_portstr,
706609
                                  &old_cl_val, &old_te_val);
706609
@@ -1813,6 +1813,10 @@
706609
         }
706609
     } while (interim_response && (interim_response < AP_MAX_INTERIM_RESPONSES));
706609
 
706609
+    /* We have to cleanup bb brigade, because buckets inserted to it could be
706609
+     * created from scpool and this pool can be freed before this brigade. */
706609
+    apr_brigade_cleanup(bb);
706609
+
706609
     /* See define of AP_MAX_INTERIM_RESPONSES for why */
706609
     if (interim_response >= AP_MAX_INTERIM_RESPONSES) {
706609
         return ap_proxyerror(r, HTTP_BAD_GATEWAY,