From: Jim Jagielski <jim@apache.org>
Date: Wed, 13 Dec 2006 14:06:43 +0000 (+0000)
Subject: Merge r484783 from trunk:
X-Git-Tag: 2.2.4~28
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=205debdd20b2144c0ca0264e1f68050ffa4214fe;p=thirdparty%2Fapache%2Fhttpd.git

Merge r484783 from trunk:

No need for each ind lb method to increment the elected
element. Do so from the main calling func.

Reviewed by: jim


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

diff --git a/STATUS b/STATUS
index 4b4cc117b34..c57b02a9e63 100644
--- a/STATUS
+++ b/STATUS
@@ -78,16 +78,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * mod_proxy_balancer: Have the find_best_worker() function
-    increment the elected counter, rather than requiring each
-    ind lb method to do it, isolating what each lb method
-    needs to do.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=484783
-     2.2.x version of patch:
-       Trunk version works.
-     +1: jim, rpluem, trawick
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mpm_winnt: Fix return values from wait_for_many_objects.
diff --git a/modules/proxy/mod_proxy_balancer.c b/modules/proxy/mod_proxy_balancer.c
index b7d4466ba74..7f55deacbaa 100644
--- a/modules/proxy/mod_proxy_balancer.c
+++ b/modules/proxy/mod_proxy_balancer.c
@@ -286,6 +286,9 @@ static proxy_worker *find_best_worker(proxy_balancer *balancer,
 
     candidate = (*balancer->lbmethod->finder)(balancer, r);
 
+    if (candidate)
+        candidate->s->elected++;
+
 /*
         PROXY_THREAD_UNLOCK(balancer);
         return NULL;
@@ -938,7 +941,6 @@ static proxy_worker *find_best_byrequests(proxy_balancer *balancer,
 
     if (mycandidate) {
         mycandidate->s->lbstatus -= total_factor;
-        mycandidate->s->elected++;
     }
 
     return mycandidate;
@@ -1017,10 +1019,6 @@ static proxy_worker *find_best_bytraffic(proxy_balancer *balancer,
         cur_lbset++;
     } while (cur_lbset <= max_lbset && !mycandidate);
 
-    if (mycandidate) {
-        mycandidate->s->elected++;
-    }
-
     return mycandidate;
 }