From a01b9d3e02e09bd92befd283affcefedf8ca1d30 Mon Sep 17 00:00:00 2001 From: Ruediger Pluem Date: Sun, 7 Oct 2007 12:29:36 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ STATUS | 8 -------- modules/proxy/proxy_util.c | 2 +- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/CHANGES b/CHANGES index 977323235e2..35069b1ec4b 100644 --- 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 318d59511b9..053c1beef54 100644 --- 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 8141d1b7800..910f3610b9a 100644 --- 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; -- 2.47.2