Merge r580466 from trunk:

Fix keepalive to proxy backend
PR 43472

Submitted by: rpluem
Reviewed by: rpluem, niq, trawick

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

diff --git a/CHANGES b/CHANGES
index 977323235e2ea8e288f73106d3a4bb8e17ff2f3b..35069b1ec4b36dcc3701c2004c0bc00902ad57af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.7
 
+  *) proxy: Fix persistent backend connections.
+     PR 43472 [Ruediger Pluem]
+
   *) mod_deflate: initialise inflate-out filter correctly when the
      first brigade contains no data buckets.
      PR 43512 [Nick Kew]

diff --git a/STATUS b/STATUS
index 318d59511b98fd19a217084c97e3d310538876cd..053c1beef5475ef09ad8dc584451dbc30fa61ff4 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -79,14 +79,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy: Fix persistent backend connections.
-     PR 43472
-     Trunk version of patch:
-        http://svn.apache.org/viewcvs.cgi?rev=580466&view=rev
-     Backport version for 2.2.x of patch:
-        Trunk version of patch works
-     +1: rpluem, niq, trawick
-
    * scoreboard: improve error message on apr_shm_create failure
      PR 40037
      http://svn.apache.org/viewvc?view=rev&revision=578620

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 8141d1b78007c3d18bbc64abe58b560ecd583519..910f3610b9a926d1bed3d3dfd7162a0657212854 100644 (file)
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2056,7 +2056,7 @@ static int is_socket_connected(apr_socket_t *socket)
         else
             return 0;
     }
-    else if (APR_STATUS_IS_EAGAIN(status)) {
+    else if (APR_STATUS_IS_EAGAIN(status) || APR_STATUS_IS_TIMEUP(status)) {
         return 1;
     }
     return 0;