Attachment 25933 Details for Bug 48949 – Patch to fix graceful restart/stop bug in Windows

[patch] Patch to fix graceful restart/stop bug in Windows

fcgid_graceful_win.diff (text/plain), 1.70 KB, created by Gregg L. Smith on 2010-08-24 19:00:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gregg L. Smith

Created: 2010-08-24 19:00:46 UTC

Size: 1.70 KB

patch

obsolete

>Index: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
>======================================================================================
>--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c	(R 939472)
>+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c	(Working Copy)
>@@ -373,7 +373,6 @@
>                 proc_table[i].diewhy = FCGID_DIE_SHUTDOWN;
>                 proc_print_exit_info(&proc_table[i], exitcode, exitwhy,
>                                      main_server);
>-                apr_pool_destroy(proc_table[i].proc_pool);
>                 proc_table[i].proc_pool = NULL;
>             }
>             else
>@@ -389,7 +388,6 @@
>                 proc_table[i].diewhy = FCGID_DIE_SHUTDOWN;
>                 proc_print_exit_info(&proc_table[i], exitcode, exitwhy,
>                                      main_server);
>-                apr_pool_destroy(proc_table[i].proc_pool);
>                 proc_table[i].proc_pool = NULL;
>             }
>         }
>Index: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
>======================================================================================
>--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c	(R 939472)
>+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c	(Working Copy)
>@@ -124,6 +124,9 @@
>         exit(1);
>     }
> 
>+    apr_pool_cleanup_register(pconf, main_server,
>+							  procmgr_stop_procmgr, apr_pool_cleanup_null);
>+ 
>     return APR_SUCCESS;
> }
> 
>@@ -257,8 +260,6 @@
> apr_status_t
> procmgr_child_init(server_rec * main_server, apr_pool_t * pchild)
> {
>-    apr_pool_cleanup_register(pchild, main_server,
>-                              procmgr_stop_procmgr, apr_pool_cleanup_null);
>     return APR_SUCCESS;
> }

Actions: View | Diff

Attachments on bug 48949: 25933