svn commit: r1728326 - /httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c

[ji...@apache.org]

Author: jim
Date: Wed Feb  3 14:33:43 2016
New Revision: 1728326

URL: http://svn.apache.org/viewvc?rev=1728326&view=rev
Log:
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).

Modified:
    httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c?rev=1728326&r1=1728325&r2=1728326&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Wed Feb  3 14:33:43 2016
@@ -824,6 +824,7 @@ static void *hc_check(apr_thread_t *thre
             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 " : ""),