From 526ae59d909b91c650205cf1659cedb1e5e286b2 Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Fri, 20 Jan 2017 08:30:00 +0000 Subject: [PATCH] mod_proxy_hcheck: Don't validate timed out responses. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1779574 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 2 ++ modules/proxy/mod_proxy_hcheck.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 8ca9ffd0c1..dd87ce9998 100644 --- a/CHANGES +++ b/CHANGES @@ -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] diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c index 344b0a3b31..1c6469ad9d 100644 --- a/modules/proxy/mod_proxy_hcheck.c +++ b/modules/proxy/mod_proxy_hcheck.c @@ -692,7 +692,7 @@ static int hc_read_body(request_rec *r, apr_bucket_brigade *bb) 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; } -- 2.40.0