]> granicus.if.org Git - apache/commitdiff
Set connectiontimeout for mod_proxy_hcheck.
authorJean-Frederic Clere <jfclere@apache.org>
Mon, 24 Jun 2019 16:29:22 +0000 (16:29 +0000)
committerJean-Frederic Clere <jfclere@apache.org>
Mon, 24 Jun 2019 16:29:22 +0000 (16:29 +0000)
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

modules/proxy/mod_proxy_hcheck.c

index 689cd01f2a26a7208d9e5a600f146174b5bf4908..1307d5ae2b5a37286ba64ddb90328996592450f0 100644 (file)
@@ -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 */