svn commit: r1757056 - /httpd/httpd/trunk/server/mpm/event/event.c

[sf...@apache.org]

Author: sf
Date: Sun Aug 21 13:06:45 2016
New Revision: 1757056

URL: http://svn.apache.org/viewvc?rev=1757056&view=rev
Log:
Revert "On exit, don't write to other generations' scoreboard slots"

As we have removed the possibility to re-use used scoreboard slots in r1757031,
we don't need this check anymore.


Modified:
    httpd/httpd/trunk/server/mpm/event/event.c

Modified: httpd/httpd/trunk/server/mpm/event/event.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/event/event.c?rev=1757056&r1=1757055&r2=1757056&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/event/event.c (original)
+++ httpd/httpd/trunk/server/mpm/event/event.c Sun Aug 21 13:06:45 2016
@@ -1258,18 +1258,12 @@ static void close_listeners(int process_
 {
     if (!*closed) {
         int i;
-        worker_score *ws;
         disable_listensocks(process_slot);
         ap_close_listeners_ex(my_bucket->listeners);
         *closed = 1;
         dying = 1;
         ap_scoreboard_image->parent[process_slot].quiescing = 1;
         for (i = 0; i < threads_per_child; ++i) {
-            ws = ap_get_scoreboard_worker_from_indexes(process_slot, i);
-            if (ws->pid != ap_my_pid) {
-                /* scoreboard slot still in use by previous generation */
-                continue;
-            }
             ap_update_child_status_from_indexes(process_slot, i,
                                                 SERVER_GRACEFUL, NULL);
         }