From: Jean-Frederic Clere Date: Mon, 24 Jun 2019 16:29:22 +0000 (+0000) Subject: Set connectiontimeout for mod_proxy_hcheck. X-Git-Tag: 2.5.0-alpha2-ci-test-only~2007 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13eda4ae2960b8a7a5d3e30e015eae7d27aecea9;p=thirdparty%2Fapache%2Fhttpd.git Set connectiontimeout for mod_proxy_hcheck. Fix for https://issues.jboss.org/browse/JBCS-448 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1862014 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c index 689cd01f2a2..1307d5ae2b5 100644 --- a/modules/proxy/mod_proxy_hcheck.c +++ b/modules/proxy/mod_proxy_hcheck.c @@ -487,6 +487,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 */