From: Jeff Trawick <trawick@apache.org>
Date: Thu, 15 Mar 2012 20:56:57 +0000 (+0000)
Subject: merge from trunk r1299738:
X-Git-Tag: 2.4.2~179
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=861cdcc5ab21262ee67567504b53f9fcbdc10b26;p=apache

merge from trunk r1299738:

mod_proxy_balancer: fix error message implying recovery during a markdown
(a fix for r962972)

Submitted by: covener
Reviewed by: jim, trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1301194 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 3aac9ecfca..d31fea3789 100644
--- a/STATUS
+++ b/STATUS
@@ -88,11 +88,7 @@ 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?rev=1299738&view=rev
-    2.4.x patch: trunk works
-    (Was changed in http://svn.apache.org/viewvc?view=revision&revision=962972)
-    +1: covener, jim, trawick
+
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 08417d656d..dbbf8bd17b 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -624,8 +624,9 @@ static int proxy_balancer_post_request(proxy_worker *worker,
             int val = ((int *)balancer->errstatuses->elts)[i];
             if (r->status == val) {
                 ap_log_rerror(APLOG_MARK, APLOG_ERR, rv, r, APLOGNO(01174)
-                              "%s:  Forcing recovery for worker (%s), "
-                              "failonstatus %d",
+                              "%s: Forcing worker (%s) into error state " 
+                              "due to status code %d matching 'failonstatus' "
+                              "balancer parameter",
                               balancer->s->name, worker->s->name, val);
                 worker->s->status |= PROXY_WORKER_IN_ERROR;
                 worker->s->error_time = apr_time_now();