From f974cdc2164d5e296cacafb51dff931af1613622 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Mon, 16 May 2011 22:33:59 +0000 Subject: [PATCH] When shutting down with worker or event with active processes which had lost their scoreboard slot during a prior graceful restart, calls to ap_unregister_extra_mpm_process() were hidden if AP_DEBUG (maintainer mode) wasn't defined. This resulted in an uninitialized generation variable being passed through to the child_status hook. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1103932 13f79535-47bb-0310-9956-ffa450edef68 --- server/mpm_unix.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/server/mpm_unix.c b/server/mpm_unix.c index 830c7b1aea..fc84b1cbd8 100644 --- a/server/mpm_unix.c +++ b/server/mpm_unix.c @@ -247,8 +247,12 @@ void ap_reclaim_child_processes(int terminate, extra_process_t *next = cur_extra->next; if (reclaim_one_pid(cur_extra->pid, action_table[cur_action].action)) { - AP_DEBUG_ASSERT(1 == ap_unregister_extra_mpm_process(cur_extra->pid, &old_gen)); - mpm_callback(-1, cur_extra->pid, old_gen); + if (ap_unregister_extra_mpm_process(cur_extra->pid, &old_gen) == 1) { + mpm_callback(-1, cur_extra->pid, old_gen); + } + else { + AP_DEBUG_ASSERT(1 == 0); + } } else { ++not_dead_yet; @@ -291,8 +295,12 @@ void ap_relieve_child_processes(ap_reclaim_callback_fn_t *mpm_callback) extra_process_t *next = cur_extra->next; if (reclaim_one_pid(cur_extra->pid, DO_NOTHING)) { - AP_DEBUG_ASSERT(1 == ap_unregister_extra_mpm_process(cur_extra->pid, &old_gen)); - mpm_callback(-1, cur_extra->pid, old_gen); + if (ap_unregister_extra_mpm_process(cur_extra->pid, &old_gen) == 1) { + mpm_callback(-1, cur_extra->pid, old_gen); + } + else { + AP_DEBUG_ASSERT(1 == 0); + } } cur_extra = next; } -- 2.40.0