svn commit: r661691 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS server/scoreboard.c

[ji...@apache.org]

Author: jim
Date: Fri May 30 05:38:46 2008
New Revision: 661691

URL: http://svn.apache.org/viewvc?rev=661691&view=rev
Log:
backport scoreboard-lb_score-2.2.x.patch


Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/server/scoreboard.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=661691&r1=661690&r2=661691&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Fri May 30 05:38:46 2008
@@ -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]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=661691&r1=661690&r2=661691&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri May 30 05:38:46 2008
@@ -90,16 +90,6 @@
 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 ]

Modified: httpd/httpd/branches/2.2.x/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/scoreboard.c?rev=661691&r1=661690&r2=661691&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/scoreboard.c (original)
+++ httpd/httpd/branches/2.2.x/server/scoreboard.c Fri May 30 05:38:46 2008
@@ -118,8 +118,7 @@
 
     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);