You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2009/01/31 21:58:07 UTC
svn commit: r739610 - in /httpd/httpd/branches/2.2.x: STATUS
modules/proxy/mod_proxy.c
Author: covener
Date: Sat Jan 31 20:58:07 2009
New Revision: 739610
URL: http://svn.apache.org/viewvc?rev=739610&view=rev
Log:
Merge r734703 from trunk:
* Set the error time if we set a worker in error mode.
Submitted by: rpluem
Reviewed By: rpluem, trawick, pgollucci
Modified:
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=739610&r1=739609&r2=739610&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Jan 31 20:58:07 2009
@@ -86,13 +86,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_proxy: Set the error time if we set a worker in error mode.
- Trunk version of patch:
- http://svn.apache.org/viewvc?rev=734703&view=rev
- Backport version for 2.2.x of patch:
- Trunk version of patch works
- +1: rpluem, trawick, pgollucci
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c?rev=739610&r1=739609&r2=739610&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy.c Sat Jan 31 20:58:07 2009
@@ -1002,8 +1002,10 @@
* We can not failover to another worker.
* Mark the worker as unusable if member of load balancer
*/
- if (balancer)
+ if (balancer) {
worker->s->status |= PROXY_WORKER_IN_ERROR;
+ worker->s->error_time = apr_time_now();
+ }
break;
}
else if (access_status == HTTP_SERVICE_UNAVAILABLE) {
@@ -1013,6 +1015,7 @@
*/
if (balancer) {
worker->s->status |= PROXY_WORKER_IN_ERROR;
+ worker->s->error_time = apr_time_now();
}
}
else {