From cf61a2ec9f58876e46940ae2e1b748b88fb013db Mon Sep 17 00:00:00 2001 From: Eric Covener Date: Sat, 31 Jan 2009 20:58:07 +0000 Subject: [PATCH] Merge r734703 from trunk: * Set the error time if we set a worker in error mode. Submitted by: rpluem Reviewed By: rpluem, trawick, pgollucci git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@739610 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 7 ------- modules/proxy/mod_proxy.c | 5 ++++- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/STATUS b/STATUS index fe59594446b..951e98d8089 100644 --- a/STATUS +++ b/STATUS @@ -86,13 +86,6 @@ RELEASE SHOWSTOPPERS: 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 ] diff --git a/modules/proxy/mod_proxy.c b/modules/proxy/mod_proxy.c index 453653649a7..70dddbb5af6 100644 --- a/modules/proxy/mod_proxy.c +++ b/modules/proxy/mod_proxy.c @@ -1002,8 +1002,10 @@ static int proxy_handler(request_rec *r) * 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 @@ static int proxy_handler(request_rec *r) */ if (balancer) { worker->s->status |= PROXY_WORKER_IN_ERROR; + worker->s->error_time = apr_time_now(); } } else { -- 2.47.2