Attachment 26599 Details for Bug 41743 – Patch to solve this bug - based on head of 2.2.x subversion branch, including correctly updating mpm_state

[patch] Patch to solve this bug - based on head of 2.2.x subversion branch, including correctly updating mpm_state

httpd-2.2.x-bug-41743-with-mpm_state.patch (text/plain), 1.13 KB, created by Andrew on 2011-02-02 20:51:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew

Created: 2011-02-02 20:51:06 UTC

Size: 1.13 KB

patch

obsolete

>Index: server/mpm/prefork/prefork.c
>===================================================================
>--- server/mpm/prefork/prefork.c	(revision 1065835)
>+++ server/mpm/prefork/prefork.c	(working copy)
>@@ -330,6 +330,7 @@
> 
> static void stop_listening(int sig)
> {
>+    mpm_state = AP_MPMQ_STOPPING;
>     ap_close_listeners();
> 
>     /* For a graceful stop, we want the child to exit when done */
>@@ -343,6 +344,7 @@
> 
> static void sig_term(int sig)
> {
>+    mpm_state = AP_MPMQ_STOPPING;
>     if (shutdown_pending == 1) {
>         /* Um, is this _probably_ not an error, if the user has
>          * tried to do a shutdown twice quickly, so we won't
>@@ -359,6 +361,7 @@
>  */
> static void restart(int sig)
> {
>+    mpm_state = AP_MPMQ_STOPPING;
>     if (restart_pending == 1) {
>         /* Probably not an error - don't bother reporting it */
>         return;
>@@ -458,8 +461,11 @@
> 
> int ap_graceful_stop_signalled(void)
> {
>-    /* not ever called anymore... */
>-    return 0;
>+    /* This function is used by other modules to check for a graceful shutdown 
>+     * For example http_core during a keepalive connection 
>+     */
>+
>+    return die_now;
> }
> 
> 
>

Actions: View | Diff

Attachments on bug 41743: 26556 | 26584 | 26598 | 26599 | 26600 | 26623