You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rp...@apache.org on 2007/10/07 14:29:36 UTC
svn commit: r582620 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/proxy_util.c
Author: rpluem
Date: Sun Oct 7 05:29:36 2007
New Revision: 582620
URL: http://svn.apache.org/viewvc?rev=582620&view=rev
Log:
Merge r580466 from trunk:
Fix keepalive to proxy backend
PR 43472
Submitted by: rpluem
Reviewed by: rpluem, niq, trawick
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=582620&r1=582619&r2=582620&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Sun Oct 7 05:29:36 2007
@@ -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]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=582620&r1=582619&r2=582620&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sun Oct 7 05:29:36 2007
@@ -79,14 +79,6 @@
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
Modified: httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c?rev=582620&r1=582619&r2=582620&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Sun Oct 7 05:29:36 2007
@@ -2056,7 +2056,7 @@
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;