You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2011/09/08 12:31:45 UTC
svn commit: r1166611 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/mod_proxy_ajp.c
Author: rpluem
Date: Thu Sep 8 10:31:44 2011
New Revision: 1166611
URL: http://svn.apache.org/viewvc?rev=1166611&view=rev
Log:
Merge r1153531 from trunk:
* Do not even sent an empty brigade down the filter chain if the headers
have not been sent by the AJP server so far. Even an empty brigade
will trigger the headers filter to create the (in this case incomplete)
HTTP headers of the response.
PR: 51608
Submitted by: rpluem
Reviewed by: rpluem, jim, jfclere
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=1166611&r1=1166610&r2=1166611&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Sep 8 10:31:44 2011
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.21
+ *) mod_proxy_ajp: Ignore flushing if headers have not been sent.
+ PR 51608 [Ruediger Pluem]
+
*) Fix a regression in the CVE-2011-3192 byterange fix.
PR 51748. [low_priority <lowprio20 gmail.com>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1166611&r1=1166610&r2=1166611&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Sep 8 10:31:44 2011
@@ -102,11 +102,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
(Accept-Range: changeset in separate proposal below)
+1: covener, wrowe, rpluem
- * mod_proxy_ajp: Ignore flushing if headers have not been sent.
- Trunk patch: http://svn.apache.org/viewvc?rev=1153531&view=rev
- 2.2.x patch: http://people.apache.org/~rpluem/patches/51608.diff
- +1: rpluem, jim, jfclere
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c?rev=1166611&r1=1166610&r2=1166611&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c Thu Sep 8 10:31:44 2011
@@ -470,16 +470,18 @@ static int ap_proxy_ajp_request(apr_pool
if (bb_len != -1)
conn->worker->s->read += bb_len;
}
- if (ap_pass_brigade(r->output_filters,
- output_brigade) != APR_SUCCESS) {
- ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
- "proxy: error processing body.%s",
- r->connection->aborted ?
- " Client aborted connection." : "");
- output_failed = 1;
+ if (headers_sent) {
+ if (ap_pass_brigade(r->output_filters,
+ output_brigade) != APR_SUCCESS) {
+ ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r,
+ "proxy: error processing body.%s",
+ r->connection->aborted ?
+ " Client aborted connection." : "");
+ output_failed = 1;
+ }
+ data_sent = 1;
+ apr_brigade_cleanup(output_brigade);
}
- data_sent = 1;
- apr_brigade_cleanup(output_brigade);
}
else {
backend_failed = 1;