You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/12/26 19:25:04 UTC
svn commit: r1553540 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
modules/proxy/mod_proxy_http.c
Author: minfrin
Date: Thu Dec 26 18:25:04 2013
New Revision: 1553540
URL: http://svn.apache.org/r1553540
Log:
mod_proxy_http: Core dumped under high load. PR 50335
trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1534321
http://svn.apache.org/viewvc?view=revision&revision=1550061
Submitted by: Jan Kaluza <jkaluza redhat.com>
Reviewed by: jim, jorton, minfrin
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1534321,1550061
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1553540&r1=1553539&r2=1553540&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu Dec 26 18:25:04 2013
@@ -2,6 +2,9 @@
Changes with Apache 2.4.8
+ * mod_proxy_http: Core dumped under high load. PR 50335
+ [Jan Kaluza <jkaluza redhat.com>]
+
*) mod_socache_shmcb.c: Remove arbitrary restriction on shared memory size
previously limited to 64MB. [Jens Låås <jelaas gmail.com>]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1553540&r1=1553539&r2=1553540&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Dec 26 18:25:04 2013
@@ -98,12 +98,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy_http: Core dumped under high load. Bugz 50335
- trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1534321
- http://svn.apache.org/viewvc?view=revision&revision=1550061
- 2.4.x patches: trunk patches work
- +1: jim, jorton, minfrin
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c?rev=1553540&r1=1553539&r2=1553540&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.4.x/modules/proxy/mod_proxy_http.c Thu Dec 26 18:25:04 2013
@@ -710,7 +710,7 @@ int ap_proxy_http_request(apr_pool_t *p,
force10 = 0;
}
- header_brigade = apr_brigade_create(p, origin->bucket_alloc);
+ header_brigade = apr_brigade_create(p, bucket_alloc);
rv = ap_proxy_create_hdrbrgd(p, header_brigade, r, p_conn,
worker, conf, uri, url, server_portstr,
&old_cl_val, &old_te_val);
@@ -1813,6 +1813,10 @@ apr_status_t ap_proxy_http_process_respo
}
} while (interim_response && (interim_response < AP_MAX_INTERIM_RESPONSES));
+ /* We have to cleanup bb brigade, because buckets inserted to it could be
+ * created from scpool and this pool can be freed before this brigade. */
+ apr_brigade_cleanup(bb);
+
/* See define of AP_MAX_INTERIM_RESPONSES for why */
if (interim_response >= AP_MAX_INTERIM_RESPONSES) {
return ap_proxyerror(r, HTTP_BAD_GATEWAY,