From: Graham Leggett <minfrin@apache.org>
Date: Sat, 27 Feb 2010 20:43:03 +0000 (+0000)
Subject: Backport:
X-Git-Tag: 2.2.15~41
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2db6988eb09fa98cbc2cd5308368455bf3b8789f;p=thirdparty%2Fapache%2Fhttpd.git

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@917038 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 23aa41f621d..9245a583ed8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,10 @@ Changes with Apache 2.2.15
      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.
diff --git a/STATUS b/STATUS
index 485c58b2bbf..f6705e48724 100644
--- a/STATUS
+++ b/STATUS
@@ -87,15 +87,6 @@ RELEASE SHOWSTOPPERS:
 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
diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 66693aa9bfe..bec8912af73 100644
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -469,7 +469,9 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                     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 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
             conn->close++;
             output_failed = 0;
             result = CMD_AJP13_END_RESPONSE;
+            request_ended = 1;
         }
 
         /*