You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by rj...@apache.org on 2012/08/18 11:20:54 UTC
svn commit: r1374534 - in /httpd/httpd/branches/2.2.x: ./ STATUS
modules/proxy/mod_proxy_balancer.c
Author: rjung
Date: Sat Aug 18 09:20:53 2012
New Revision: 1374534
URL: http://svn.apache.org/viewvc?rev=1374534&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.2.x/ (props changed)
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
Propchange: httpd/httpd/branches/2.2.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1299738
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=1374534&r1=1374533&r2=1374534&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Aug 18 09:20:53 2012
@@ -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
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c?rev=1374534&r1=1374533&r2=1374534&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_balancer.c Sat Aug 18 09:20:53 2012
@@ -617,8 +617,10 @@ static int proxy_balancer_post_request(p
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();