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 2010/02/27 21:43:03 UTC
svn commit: r917038 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/mod_proxy_ajp.c
Author: minfrin
Date: Sat Feb 27 20:43:03 2010
New Revision: 917038
URL: http://svn.apache.org/viewvc?rev=917038&view=rev
Log:
Backport:
mod_proxy_ajp: Really regard the operation a success, when the client
aborted the connection. In addition adjust the log message if the client
aborted the connection.
+1: rpluem, sf, minfrin
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=917038&r1=917037&r2=917038&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sat Feb 27 20:43:03 2010
@@ -9,6 +9,10 @@
access control is still vulnerable, unless using OpenSSL >= 0.9.8l.
[Joe Orton, Ruediger Pluem, Hartmut Keil <Hartmut.Keil adnovum.ch>]
+ *) mod_proxy_ajp: Really regard the operation a success, when the client
+ aborted the connection. In addition adjust the log message if the client
+ aborted the connection. [Ruediger Pluem]
+
*) mod_negotiation: Preserve query string over multiviews negotiation.
This buglet was fixed for type maps in 2.2.6, but the same issue
affected multiviews and was overlooked.
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=917038&r1=917037&r2=917038&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Feb 27 20:43:03 2010
@@ -87,15 +87,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy_ajp: Really regard the operation a success, when the client
- aborted the connection. In addition adjust the log message if the client
- aborted the connection.
- Trunk version of patch:
- http://svn.apache.org/viewvc?rev=911466&view=rev
- Backport version for 2.2.x of patch:
- Trunk version of patch works
- +1: rpluem, sf, minfrin
-
* mod_ssl: Add SSLInsecureRenegotiation directive.
Trunk version of patch:
http://svn.apache.org/viewcvs.cgi?rev=906039&view=rev
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=917038&r1=917037&r2=917038&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 Sat Feb 27 20:43:03 2010
@@ -469,7 +469,9 @@
if (ap_pass_brigade(r->output_filters,
output_brigade) != APR_SUCCESS) {
ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,
- "proxy: error processing body");
+ "proxy: error processing body.%s",
+ r->connection->aborted ?
+ " Client aborted connection." : "");
output_failed = 1;
}
data_sent = 1;
@@ -507,6 +509,7 @@
conn->close++;
output_failed = 0;
result = CMD_AJP13_END_RESPONSE;
+ request_ended = 1;
}
/*