From a2597bc596411551f5c3d6f61fbba8d14fd31fba Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Wed, 24 Oct 2007 03:56:50 +0000 Subject: [PATCH] Actually re-fix Christian's recommendation, someone previously caught this. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@587771 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +-- server/scoreboard.c | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/CHANGES b/CHANGES index ffaf348fb8..45fb51de6d 100644 --- a/CHANGES +++ b/CHANGES @@ -4,8 +4,7 @@ Changes with Apache 2.3.0 *) 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 ] + provide the unusual legacy lookup. [William Rowe] *) mod_proxy_http: Check but don't escape/unescape forward-proxied URLs PR 42592 [Nick Kew] diff --git a/server/scoreboard.c b/server/scoreboard.c index 3ad995fcf0..54d1fc8648 100644 --- a/server/scoreboard.c +++ b/server/scoreboard.c @@ -477,8 +477,8 @@ void ap_time_process_request(ap_sb_handle_t *sbh, int status) 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]; -- 2.50.1