* Close connection to backend if reading of request body fails.

PR: 40310
Submitted by: Ian Abel <ianabel mxtelecom.com>
Reviewed by: rpluem

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@434483 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index d899270ddb6832ec077645fff070c82f8a60fab2..23dfffa61417da69a3c100bb38c6b1a36d160ffd 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_proxy_ajp: Close connection to backend if reading of request body
+     fails. PR 40310. [Ian Abel <ianabel mxtelecom.com>]
+
   *) All MPMs: Introduce a check_config phase between pre_config and
      open_logs, to allow modules to review interdependent configuration
      directive values and adjust them while messages can still be logged
@@ -9,7 +12,7 @@ Changes with Apache 2.3.0
      and format messages for both the console and the error log, as
      appropriate.  [Chris Darroch]
 
-  *) mod_proxy: don't try to use dead backend connection (PR#37770)
+  *) mod_proxy: Don't try to use dead backend connection. PR 37770.
      [Olivier BOEL <ob dorrboel.com>]
 
   *) mod_proxy: don't URLencode tilde in path component
@@ -46,7 +49,7 @@ Changes with Apache 2.3.0
      SymLinksIfOwnerMatch. [Nick Kew, Ruediger Pluem, William Rowe]
 
   *) mod_proxy: Support environment variable interpolation in reverse
-     proxying directives [Nick Kew]
+     proxying directives. [Nick Kew]
 
   *) mod_proxy_balancer: Workers can now be defined as "hot standby" which
      will only be used if all other workers are unusable (eg: in
@@ -66,7 +69,7 @@ Changes with Apache 2.3.0
      [Brian <brectanu gmail.com>]
 
   *) mod_isapi: Avoid double trailing slashes in HSE_REQ_MAP_URL_TO_PATH
-     support.  Also corrects the slashes for Windows.  PR 15993  [William Rowe]
+     support.  Also corrects the slashes for Windows.  PR 15993. [William Rowe]
 
   *) mod_isapi: Handle "HTTP/1.1 200 OK" style status lines correctly, the
      token parser worked while the resulting length was misinterpreted.

diff --git a/modules/proxy/mod_proxy_ajp.c b/modules/proxy/mod_proxy_ajp.c
index 3c73c55e04feb8c54ac701d56a6a754b8f1c31cf..624909924a43d95769b3c1c8b5232b418ca8f49c 100644 (file)
--- a/modules/proxy/mod_proxy_ajp.c
+++ b/modules/proxy/mod_proxy_ajp.c
@@ -175,6 +175,8 @@ static int ap_proxy_ajp_request(apr_pool_t *p, request_rec *r,
                                 AJP13_MAX_SEND_BODY_SZ);
 
         if (status != APR_SUCCESS) {
+            /* We had a failure: Close connection to backend */
+            conn->close++;
             ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                          "proxy: ap_get_brigade failed");
             apr_brigade_destroy(input_brigade);