Approvd

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

diff --git a/STATUS b/STATUS
index cca99e2eb46c831912aef3a72e21820367d9e191..2b6e61babb75677eabf4cada3adc6250ed875ab7 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_balancer: Try first if we find any "recoverable" workers before
-   we force them to recover.
-   Trunk version of patch:
-      http://svn.apache.org/viewvc?rev=734710&view=rev
-   Backport version for 2.2.x of patch:
-      Trunk version of patch works
-   +1: rpluem, pgollucci, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
@@ -105,6 +98,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
       http://svn.apache.org/viewvc?view=rev&revision=739854
    Backport version for 2.2.x of patch:
       http://people.apache.org/~jim/patches/httpd-2.2-lbset.patch
+   +1: jim
 
 PATCHES/ISSUES THAT ARE STALLED
 

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index c0dc2af975ccec4c8e92517ebc19f701dd34eab5..01b0566b11cab1b5c6f1e40e457fc2ed498919a2 100644 (file)
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -406,7 +406,15 @@ static void force_recovery(proxy_balancer *balancer, server_rec *s)
     for (i = 0; i < balancer->workers->nelts; i++, worker++) {
         if (!(worker->s->status & PROXY_WORKER_IN_ERROR)) {
             ok = 1;
-            break;    
+            break;
+        }
+        else {
+            /* Try if we can recover */
+            ap_proxy_retry_worker("BALANCER", worker, s);
+            if (!(worker->s->status & PROXY_WORKER_IN_ERROR)) {
+                ok = 1;
+                break;
+            }
         }
     }
     if (!ok) {