From: Stefan Eissing Date: Thu, 18 Jul 2019 13:58:11 +0000 (+0000) Subject: Merge of r1862014 from trunk: X-Git-Tag: 2.4.40~40 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f12b46a33a88db207cf502025706b2beb502f6c6;p=thirdparty%2Fapache%2Fhttpd.git Merge of r1862014 from trunk: *) mod_proxy_hcheck fix for BZ 60948 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1863318 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c index dd8e4071764..0d0ad997e78 100644 --- a/modules/proxy/mod_proxy_hcheck.c +++ b/modules/proxy/mod_proxy_hcheck.c @@ -483,6 +483,10 @@ static proxy_worker *hc_get_hcworker(sctx_t *ctx, proxy_worker *worker, hc->hash.def = hc->s->hash.def = ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_DEFAULT); hc->hash.fnv = hc->s->hash.fnv = ap_proxy_hashfunc(hc->s->name, PROXY_HASHFUNC_FNV); hc->s->port = port; + if (worker->s->conn_timeout_set) { + hc->s->conn_timeout_set = worker->s->conn_timeout_set; + hc->s->conn_timeout = worker->s->conn_timeout; + } /* Do not disable worker in case of errors */ hc->s->status |= PROXY_WORKER_IGNORE_ERRORS; /* Mark as the "generic" worker */