Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 77348 invoked from network); 7 Nov 2006 13:34:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 7 Nov 2006 13:34:29 -0000 Received: (qmail 79688 invoked by uid 500); 7 Nov 2006 13:34:39 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 79643 invoked by uid 500); 7 Nov 2006 13:34:39 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 79632 invoked by uid 99); 7 Nov 2006 13:34:39 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2006 05:34:39 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Nov 2006 05:34:27 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 00EAC1A984D; Tue, 7 Nov 2006 05:34:00 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r472104 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/proxy_util.c Date: Tue, 07 Nov 2006 13:34:00 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061107133401.00EAC1A984D@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Tue Nov 7 05:34:00 2006 New Revision: 472104 URL: http://svn.apache.org/viewvc?view=rev&rev=472104 Log: Merge r431339 from trunk: PR#37770: Don't try to use dead backend connection in proxy (Patch from Olivier BOEL) Submitted by: niq Reviewed by: jim 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?view=diff&rev=472104&r1=472103&r2=472104 ============================================================================== --- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original) +++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Nov 7 05:34:00 2006 @@ -1,6 +1,9 @@ -*- coding: utf-8 -*- Changes with Apache 2.2.4 + *) mod_proxy: Don't try to use dead backend connection. PR 37770. + [Olivier BOEL ] + *) mod_proxy_balancer: Extract stickysession routing information contained as parameter in the URL correctly. PR 40400. [Ruediger Pluem, Tomokazu Harada ] Modified: httpd/httpd/branches/2.2.x/STATUS URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?view=diff&rev=472104&r1=472103&r2=472104 ============================================================================== --- httpd/httpd/branches/2.2.x/STATUS (original) +++ httpd/httpd/branches/2.2.x/STATUS Tue Nov 7 05:34:00 2006 @@ -77,12 +77,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * mod_proxy: Don't try to use dead backend connection in proxy - http://svn.apache.org/viewvc?view=rev&revision=431339 - PR#37770. Patch by Olivier Boel - +1: niq, rpluem, mturk - +1/emeritus: jwooley (in a comment today on PR#37770) - PATCHES PROPOSED TO BACKPORT FROM TRUNK: * mpm_winnt: Fix return values from wait_for_many_objects. 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?view=diff&rev=472104&r1=472103&r2=472104 ============================================================================== --- httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c (original) +++ httpd/httpd/branches/2.2.x/modules/proxy/proxy_util.c Tue Nov 7 05:34:00 2006 @@ -1969,7 +1969,8 @@ socket_status = apr_socket_recv(sock, test_buffer, &buffer_len); /* put back old timeout */ apr_socket_timeout_set(sock, current_timeout); - if (APR_STATUS_IS_EOF(socket_status)) + if (APR_STATUS_IS_EOF(socket_status) || + APR_STATUS_IS_ECONNRESET(socket_status)) return 0; else return 1;