From: Nick Kew <niq@apache.org>
Date: Fri, 28 Sep 2007 19:30:37 +0000 (+0000)
Subject: Fix keepalive to proxy backend
X-Git-Tag: 2.3.0~1376
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a153ecd496ad46d4dec90e0b1c9eae804a8d6415;p=thirdparty%2Fapache%2Fhttpd.git

Fix keepalive to proxy backend
PR 43472


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

diff --git a/CHANGES b/CHANGES
index ec25441ccc6..0f425bf6b31 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,9 @@
 Changes with Apache 2.3.0
 [ When backported to 2.2.x, remove entry from this file ]
 
+  *) proxy: Fix persistent backend connections
+     PR 43472 [Ruediger Pluem]
+
   *) mod_proxy_http: Correctly parse all Connection headers in proxy.
      PR 43509 [Nick Kew]
 
diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index 138173e8d0c..0b1d1f300ca 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -2078,7 +2078,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;