From a05fa66be1dbf106f6d4a448c7b44bfa8809022e Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Mon, 11 Apr 2016 19:50:28 +0000 Subject: [PATCH] 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 --- CHANGES | 3 +++ server/mpm/event/event.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGES b/CHANGES index 012b07b159..a5c23f0f16 100644 --- 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 4c4853f856..c0d55e5d9f 100644 --- 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; } -- 2.50.1