Don't take over scoreboard slots from gracefully finishing threads

Otherwise the old and the new thread will both update the same scoreboard slot
with undefined results.

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

diff --git a/CHANGES b/CHANGES
index 012b07b15914ea522551d63d39c1acb2b63a1bb3..a5c23f0f16edb0d03a0770164735fe5b1cb7d135 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.5.0
 
+  *) mpm_event: Don't take over scoreboard slots from gracefully finishing
+     threads. [Stefan Fritsch]
+
   *) mod_status: Display the process slot number in the async connection
      overview. [Stefan Fritsch]
 

diff --git a/server/mpm/event/event.c b/server/mpm/event/event.c
index 4c4853f8565aab80331be21d77af778d05184718..c0d55e5d9fa2843a4f5fa81848df4bb588c38d74 100644 (file)
--- a/server/mpm/event/event.c
+++ b/server/mpm/event/event.c
@@ -2408,7 +2408,7 @@ static void *APR_THREAD_FUNC start_threads(apr_thread_t * thd, void *dummy)
             int status =
                 ap_scoreboard_image->servers[my_child_num][i].status;
 
-            if (status != SERVER_GRACEFUL && status != SERVER_DEAD) {
+            if (status != SERVER_DEAD) {
                 continue;
             }