From: Mladen Turk <mturk@apache.org>
Date: Wed, 15 Sep 2004 18:27:08 +0000 (+0000)
Subject: Do not set shared data from previous worker if ap_get_scoreboard_lb fails.
X-Git-Tag: 2.1.1~259
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=31df4f2be87b344d36f0af11ba8481e88d2f958a;p=thirdparty%2Fapache%2Fhttpd.git

Do not set shared data from previous worker if ap_get_scoreboard_lb fails.


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

diff --git a/modules/proxy/proxy_balancer.c b/modules/proxy/proxy_balancer.c
index 0d6f3e342e3..05b8bf7010b 100644
--- a/modules/proxy/proxy_balancer.c
+++ b/modules/proxy/proxy_balancer.c
@@ -42,14 +42,15 @@ static int init_runtime_score(apr_pool_t *pool, proxy_balancer *balancer)
     double median, ffactor = 0.0;
     proxy_runtime_worker *workers;    
 #if PROXY_HAS_SCOREBOARD
-    lb_score *score = NULL;
+    lb_score *score;
 #else
-    void *score = NULL;
+    void *score;
 #endif
 
     workers = (proxy_runtime_worker *)balancer->workers->elts;
 
     for (i = 0; i < balancer->workers->nelts; i++) {
+        score = NULL;
 #if PROXY_HAS_SCOREBOARD
         /* Get scoreboard slot */
         if (ap_scoreboard_image)