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 ec25441ccc698446d6b4c34dee0b223a62d9da8f..0f425bf6b3138426f0c1d030c59b8ae49a87fcd0 100644 (file)
--- 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 138173e8d0c050c4114263f8045dd8bc854ff136..0b1d1f300cabe9afa4c463c8aa4b3d8e0470fd8f 100644 (file)
--- 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;