Fix the calculation of thread_num in the worker score structure.

Submitted by:   Stas Bekman
Reviewed by:    Jeff Trawick

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

diff --git a/CHANGES b/CHANGES
index 84300e29eab29cc816bae8083d1f5b1d4b4e95a2..c8c4a65b0f12c9f6d56c0a4bda0bd4d3c5946f32 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,8 @@
 Changes with Apache 2.0.34-dev
+
+  *) Fix the calculation of thread_num in the worker score structure.
+     [Stas Bekman]
+
   *) Use apr_atomic operations in managing the mod_mem_cache
      cache_objects for SMP scalability. (see USE_ATOMICS
      preprocessor directive in mod_file_cache)

diff --git a/server/scoreboard.c b/server/scoreboard.c
index be5befbfd837c6e8c064e73be06764c726c94170..a5fdcec8864a75f6d2ea23769646d104de6dd55d 100644 (file)
--- a/server/scoreboard.c
+++ b/server/scoreboard.c
@@ -429,7 +429,7 @@ AP_DECLARE(int) ap_update_child_status_from_indexes(int child_num,
     
     if (status == SERVER_READY
         && old_status == SERVER_STARTING) {
-        ws->thread_num = child_num * server_limit + thread_num;
+        ws->thread_num = child_num * thread_limit + thread_num;
         ps->generation = ap_my_generation;
     }