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

diff --git a/STATUS b/STATUS
index fe59594446b7db2b0e54302774b2fee7b27ebf65..951e98d8089e0ac4e6873d892cd1669569be34f3 100644 (file)
--- 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 453653649a7da47d8a5ef3bc5f67ad1661e1f0d5..70dddbb5af62682f17fa4391a7be98fcb9d24480 100644 (file)
--- 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 {