does the mod_proxy.h require a minor mmn bump? On Tue, Oct 11, 2022 at 9:20 AM <j...@apache.org> wrote: > > Author: jim > Date: Tue Oct 11 13:20:11 2022 > New Revision: 1904518 > > URL: http://svn.apache.org/viewvc?rev=1904518&view=rev > Log: > *) mod_proxy_hcheck: Re-enable workers in standard ERROR state. PR 66302. > [Alessandro Cavaliere <alessandro.cavalier7 unibo.it>] > > Modified: > httpd/httpd/trunk/CHANGES > httpd/httpd/trunk/modules/proxy/mod_proxy.h > httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c > > Modified: httpd/httpd/trunk/CHANGES > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=1904518&r1=1904517&r2=1904518&view=diff > ============================================================================== > --- httpd/httpd/trunk/CHANGES [utf-8] (original) > +++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 11 13:20:11 2022 > @@ -1,6 +1,9 @@ > -*- coding: utf-8 > -*- > Changes with Apache 2.5.1 > > + *) mod_proxy_hcheck: Re-enable workers in standard ERROR state. PR 66302. > + [Alessandro Cavaliere <alessandro.cavalier7 unibo.it>] > + > *) mod_proxy_hcheck: Detect AJP/CPING support correctly. PR 66300. > [Alessandro Cavaliere <alessandro.cavalier7 unibo.it>] > > > Modified: httpd/httpd/trunk/modules/proxy/mod_proxy.h > URL: > http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy.h?rev=1904518&r1=1904517&r2=1904518&view=diff > ============================================================================== > --- httpd/httpd/trunk/modules/proxy/mod_proxy.h (original) > +++ httpd/httpd/trunk/modules/proxy/mod_proxy.h Tue Oct 11 13:20:11 2022 > @@ -360,6 +360,8 @@ PROXY_WORKER_HC_FAIL ) > > #define PROXY_WORKER_IS_HCFAILED(f) ( (f)->s->status & > PROXY_WORKER_HC_FAIL ) > > +#define PROXY_WORKER_IS_ERROR(f) ( (f)->s->status & PROXY_WORKER_IN_ERROR > ) > + > #define PROXY_WORKER_IS(f, b) ( (f)->s->status & (b) ) > > /* default worker retry timeout in seconds */ > > 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=1904518&r1=1904517&r2=1904518&view=diff > ============================================================================== > --- httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c (original) > +++ httpd/httpd/trunk/modules/proxy/mod_proxy_hcheck.c Tue Oct 11 13:20:11 > 2022 > @@ -927,7 +927,7 @@ static void * APR_THREAD_FUNC hc_check(a > (int)hc->s->method); > } > /* what state are we in ? */ > - else if (PROXY_WORKER_IS_HCFAILED(worker)) { > + else if (PROXY_WORKER_IS_HCFAILED(worker) || > PROXY_WORKER_IS_ERROR(worker)) { > if (rv == APR_SUCCESS) { > worker->s->pcount += 1; > if (worker->s->pcount >= worker->s->passes) { > >
-- Eric Covener cove...@gmail.com
