From 882add0989e1aec533bcf2eae42535f9bb6cc1b5 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 30 Aug 2016 12:14:37 +0000 Subject: [PATCH] Merge r1757662 from trunk: * Add missing copy of hcuri and hcexpr ftom the worker to the health check worker. PR: 60038 Submitted by: zdeno Submitted by: rpluem Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1758373 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 8 -------- modules/proxy/mod_proxy_hcheck.c | 2 ++ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/CHANGES b/CHANGES index 090262cd4d..0edf11cb0c 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.24 + *) mod_proxy_hcheck: Set health check URI and expression correctly for health + check worker. PR 60038 [zdeno ] + *) mod_http2: if configured with nghttp2 1.14.0 and onward, invalid request headers will immediately reset the stream with a PROTOCOL error. Feature logged by module on startup as 'INVHD' in info message. diff --git a/STATUS b/STATUS index c15472de5f..82e19dc50d 100644 --- a/STATUS +++ b/STATUS @@ -117,14 +117,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_proxy_hcheck: Add missing copy of hcuri and hcexpr ftom the worker to - the health check worker. - Trunk version of patch: - http://svn.apache.org/r1757662 - Backport version for 2.4.x of patch: - Trunk version of patch works - CHANGES in http://svn.apache.org/r1757663 - +1: rpluem, jim, covener PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c index 0143fd45a5..0dee1b4595 100644 --- a/modules/proxy/mod_proxy_hcheck.c +++ b/modules/proxy/mod_proxy_hcheck.c @@ -426,6 +426,8 @@ static proxy_worker *hc_get_hcworker(sctx_t *ctx, proxy_worker *worker, PROXY_STRNCPY(hc->s->name, wptr); PROXY_STRNCPY(hc->s->hostname, worker->s->hostname); PROXY_STRNCPY(hc->s->scheme, worker->s->scheme); + PROXY_STRNCPY(hc->s->hcuri, worker->s->hcuri); + PROXY_STRNCPY(hc->s->hcexpr, worker->s->hcexpr); 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; -- 2.40.0