From: Jim Jagielski <jim@apache.org>
Date: Wed, 3 Feb 2016 14:33:43 +0000 (+0000)
Subject: Enabling a worker via health-check also moves them out of
X-Git-Tag: 2.5.0-alpha~2211
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f5e5bde8b3d91f42d7cb81e34eb2b0e2e1b9c4d;p=thirdparty%2Fapache%2Fhttpd.git

Enabling a worker via health-check also moves them out of
ERROR more (which may have been set via the static
"health" check done via mod_proxy).

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1728326 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_hcheck.c b/modules/proxy/mod_proxy_hcheck.c
index 77f2c6dce81..a25c6bbc489 100644
--- a/modules/proxy/mod_proxy_hcheck.c
+++ b/modules/proxy/mod_proxy_hcheck.c
@@ -824,6 +824,7 @@ static void *hc_check(apr_thread_t *thread, void *b)
             worker->s->pcount += 1;
             if (worker->s->pcount >= worker->s->passes) {
                 ap_proxy_set_wstatus(PROXY_WORKER_HC_FAIL_FLAG, 0, worker);
+                ap_proxy_set_wstatus(PROXY_WORKER_IN_ERROR_FLAG, 0, worker);
                 worker->s->pcount = 0;
                 ap_log_error(APLOG_MARK, APLOG_INFO, 0, s, APLOGNO(03302)
                              "%sHealth check ENABLING %s", (thread ? "Threaded " : ""),