Commit 0e4266ab authored by Rainer Jung's avatar Rainer Jung
Browse files

mod_proxy_balancer: fix error message implying recovery 

during a markdown.

Backport of r1299738 from trunk resp. r1301194 from 2.4.x.

Submitted by: covener
Reviewed by: trawick, wrowe
Backported by: rjung


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1374534 13f79535-47bb-0310-9956-ffa450edef68
parent 24fab281

STATUS

+0 −6
Original line number Diff line number Diff line
@@ -93,12 +93,6 @@ RELEASE SHOWSTOPPERS: 
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:

  [ start all new proposals below, under PATCHES PROPOSED. ]



   * mod_proxy_balancer: fix error message implying recovery during a markdown

     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1299738

     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1301194

     2.2.x patch: http://people.apache.org/~rjung/patches/mod_proxy_balancer-fix-error-message-2_2.patch

     +1: rjung, trawick, wrowe



   * core: (dummy_connection): Destroy tmp pool and return on connect() failure.

     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1300171

     2.4.x patch: http://svn.apache.org/viewvc?view=revision&revision=1301649

modules/proxy/mod_proxy_balancer.c

+4 −2
Original line number Diff line number Diff line
@@ -617,8 +617,10 @@ static int proxy_balancer_post_request(proxy_worker *worker, 
        for (i = 0; i < balancer->errstatuses->nelts; i++) {

            int val = ((int *)balancer->errstatuses->elts)[i];

            if (r->status == val) {

                ap_log_error(APLOG_MARK, APLOG_ERR, rv, r->server,

                             "proxy: BALANCER: (%s).  Forcing recovery for worker (%s), failonstatus %d",

                ap_log_rerror(APLOG_MARK, APLOG_ERR, 0, r,

                             "proxy: BALANCER: (%s).  Forcing worker (%s) into error state "

                             "due to status code %d matching 'failonstatus' "

                             "balancer parameter",

                             balancer->name, worker->name, val);

                worker->s->status |= PROXY_WORKER_IN_ERROR;

                worker->s->error_time = apr_time_now();