backport scoreboard-lb_score-2.2.x.patch

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

diff --git a/CHANGES b/CHANGES
index 818cae56f1f5a48d144b9d5977860dfd04a4c2f0..ceeea727a393710ce336dcc8a94a14d51cdb9c33 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) scoreboard: Remove unused proxy load balancer elements from scoreboard
+     image (not scoreboard memory itself).  [Chris Darroch]
+
   *) mod_proxy: Support environment variable interpolation in reverse
      proxying directives. [Nick Kew]
 

diff --git a/STATUS b/STATUS
index 29f6f2362e649a24c2ea171ece4a8216fdb01996..53c9db5baa6c82a66763a803602d61ff56192683 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -90,16 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * scoreboard: Remove unused proxy load balancer elements from scoreboard
-     image (not scoreboard memory itself).  Array of lb_score elements
-     originally added in r104404 in manner akin to that used for
-     worker_score.  Supporting code then removed in r105134 but scoreboard
-     image size calculation left in place, likely by accident.
-     Trunk version of patch:
-       http://svn.apache.org/viewvc?view=rev&revision=404848
-     Backport version for 2.2.x:
-       http://people.apache.org/~chrisd/patches/scoreboard_lb_score/scoreboard-lb_score-2.2.x.patch
-     +1: chrisd, rpluem, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/server/scoreboard.c b/server/scoreboard.c
index d8ad610f3587cbfc1eaa4883f1110782b8fd8292..060de5ca78ade29c688bd6afa22356c6c6953c71 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -118,8 +118,7 @@ void ap_init_scoreboard(void *shared_score)
 
     ap_calc_scoreboard_size();
     ap_scoreboard_image =
-        calloc(1, sizeof(scoreboard) + server_limit * sizeof(worker_score *) +
-               server_limit * lb_limit * sizeof(lb_score *));
+        calloc(1, sizeof(scoreboard) + server_limit * sizeof(worker_score *));
     more_storage = shared_score;
     ap_scoreboard_image->global = (global_score *)more_storage;
     more_storage += sizeof(global_score);