svn commit: r587771 - in /httpd/httpd/trunk: CHANGES server/scoreboard.c

[wr...@apache.org]

Author: wrowe
Date: Tue Oct 23 20:56:50 2007
New Revision: 587771

URL: http://svn.apache.org/viewvc?rev=587771&view=rev
Log:
Actually re-fix Christian's recommendation, someone previously caught this.

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/server/scoreboard.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=587771&r1=587770&r2=587771&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Tue Oct 23 20:56:50 2007
@@ -4,8 +4,7 @@
 
   *) core; scoreboard: ap_get_scoreboard_worker(sbh) now takes the sbh member
      from the connection rec, ap_get_scoreboard_worker(proc, thread) will now
-     provide the unusual legacy lookup.  Also cleans up PR 31127 range checks.
-     [William Rowe, Christian von Roques <roques mti.ag>]
+     provide the unusual legacy lookup.  [William Rowe]
 
   *) mod_proxy_http: Check but don't escape/unescape forward-proxied URLs
      PR 42592 [Nick Kew]

Modified: httpd/httpd/trunk/server/scoreboard.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/scoreboard.c?rev=587771&r1=587770&r2=587771&view=diff
==============================================================================
--- httpd/httpd/trunk/server/scoreboard.c (original)
+++ httpd/httpd/trunk/server/scoreboard.c Tue Oct 23 20:56:50 2007
@@ -477,8 +477,8 @@
 
 AP_DECLARE(worker_score *) ap_get_scoreboard_worker_from_indexes(int x, int y)
 {
-    if (((x < 0) || (x > server_limit)) ||
-        ((y < 0) || (y > thread_limit))) {
+    if (((x < 0) || (x >= server_limit)) ||
+        ((y < 0) || (y >= thread_limit))) {
         return(NULL); /* Out of range */
     }
     return &ap_scoreboard_image->servers[x][y];