Merge r431339 from trunk:

PR#37770: Don't try to use dead backend connection in proxy
(Patch from Olivier BOEL)

Submitted by: niq
Reviewed by: jim

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

diff --git a/CHANGES b/CHANGES
index e6acc658350fb63522b88ab3f531da46bd5cfcde..9298aee997f64d5b6e709423694e0646cc679fc9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.4
 
+  *) mod_proxy: Don't try to use dead backend connection. PR 37770.
+     [Olivier BOEL <ob dorrboel.com>] 
+
   *) mod_proxy_balancer: Extract stickysession routing information contained as
      parameter in the URL correctly. PR 40400.
      [Ruediger Pluem, Tomokazu Harada <harada sysrdc.ns-sol.co.jp>]

diff --git a/STATUS b/STATUS
index d06bba472c1edbc3733f7058ea8623ef31e2a63e..353100ad950ac649c3e0456d893eb69581afc455 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -77,12 +77,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_proxy: Don't try to use dead backend connection in proxy
-     http://svn.apache.org/viewvc?view=rev&revision=431339
-     PR#37770.  Patch by Olivier Boel
-    +1: niq, rpluem, mturk
-    +1/emeritus: jwooley (in a comment today on PR#37770)
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index d6fecbdb83e8d78294871d0ce0f01d9403713aa8..0f87b07cdace274e14e5bbcea59c00146e2ebb6d 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1969,7 +1969,8 @@ static int is_socket_connected(apr_socket_t *sock)
     socket_status = apr_socket_recv(sock, test_buffer, &buffer_len);
     /* put back old timeout */
     apr_socket_timeout_set(sock, current_timeout);
-    if (APR_STATUS_IS_EOF(socket_status))
+    if (APR_STATUS_IS_EOF(socket_status) || 
+        APR_STATUS_IS_ECONNRESET(socket_status))
         return 0;
     else
         return 1;