From: Jim Jagielski <jim@apache.org>
Date: Thu, 3 Aug 2006 11:30:11 +0000 (+0000)
Subject: Reset standby flags for each loop through the cluster sets
X-Git-Tag: 2.3.0~2175
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585f146b66ecb0d31d8090f06f0ed111ddb47161;p=thirdparty%2Fapache%2Fhttpd.git

Reset standby flags for each loop through the cluster sets


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428352 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index 8f995d73a8b..9bd24dc4bf7 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -876,8 +876,6 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer,
     int total_factor = 0;
     proxy_worker *worker;
     proxy_worker *mycandidate = NULL;
-    int checking_standby = 0;
-    int checked_standby = 0;
     int cur_lbset = 0;
     int max_lbset = 0;
     
@@ -887,6 +885,8 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer,
 
     /* First try to see if we have available candidate */
     do {
+        int checking_standby = 0;
+        int checked_standby = 0;
         while (!mycandidate && !checked_standby) {
             worker = (proxy_worker *)balancer->workers->elts;
             for (i = 0; i < balancer->workers->nelts; i++, worker++) {
@@ -953,8 +953,6 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer,
     apr_off_t mytraffic = 0;
     apr_off_t curmin = 0;
     proxy_worker *worker;
-    int checking_standby = 0;
-    int checked_standby = 0;
     proxy_worker *mycandidate = NULL;
     int cur_lbset = 0;
     int max_lbset = 0;
@@ -965,6 +963,8 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer,
 
     /* First try to see if we have available candidate */
     do {
+        int checking_standby = 0;
+        int checked_standby = 0;
         while (!mycandidate && !checked_standby) {
             worker = (proxy_worker *)balancer->workers->elts;
             for (i = 0; i < balancer->workers->nelts; i++, worker++) {