Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1779574 - in /httpd/httpd/trunk: CHANGES
 modules/proxy/mod_proxy_hcheck.c
Date: Fri, 20 Jan 2017 08:30:00 -0000
To: cvs@httpd.apache.org
From: ylavic@apache.org
Message-Id: <20170120083001.72CF53A0217@svn01-us-west.apache.org>
archived-at: Fri, 20 Jan 2017 08:30:03 -0000

Author: ylavic
Date: Fri Jan 20 08:30:00 2017
New Revision: 1779574

URL: http://svn.apache.org/viewvc?rev=1779574&view=rev
Log:
mod_proxy_hcheck: Don't validate timed out responses.


Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1779574&r1=1779573&r2=1779574&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Fri Jan 20 08:30:00 2017
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mod_proxy_hcheck: Don't validate timed out responses.  [Yann Ylavic]
+
   *) mod_proxy_hcheck: Ensure thread-safety when concurrent healthchecks are
      in use (ProxyHCTPsize > 0).  PR 60071.  [Yann Ylavic, Jim Jagielski]
 

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1779574&r1=1779573&r2=1779574&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Fri Jan 20 08:30:00 2017
@@ -692,7 +692,7 @@ static int hc_read_body(request_rec *r,
                             APR_BLOCK_READ, len);
 
         if (rv != APR_SUCCESS) {
-            if (APR_STATUS_IS_TIMEUP(rv) || APR_STATUS_IS_EOF(rv)) {
+            if (APR_STATUS_IS_EOF(rv)) {
                 rv = APR_SUCCESS;
                 break;
             }