Fix some broken logic in the prefork MPM. Basically, in the past, if we

accepted a request, we didn't want to die if given a graceful restart
signal.  The logic I am removing stops us from dying for a graceless
restart/stop signal, which is just wrong.  If we are sent a graceless
restart/stop, then we need to stop immediately.

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

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 8675b987cf3566d4bb50addcf3544f8a2409e018..dcd8135c3345fda1803bd6ea0dbb31554d790d26 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -667,7 +667,6 @@ static void child_main(int child_num_arg)
            /* if we accept() something we don't want to die, so we have to
             * defer the exit
             */
-            apr_signal(SIGTERM, please_die_gracefully);
            for (;;) {
                 ap_sync_scoreboard_image();
                if (I_AM_TO_SHUTDOWN()) {