httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r1234169 - in /httpd/mod_fcgid/trunk/modules/fcgid: fcgid_pm_main.c fcgid_pm_win.c
Date Fri, 20 Jan 2012 22:02:50 GMT
Author: wrowe
Date: Fri Jan 20 22:02:50 2012
New Revision: 1234169

URL: http://svn.apache.org/viewvc?rev=1234169&view=rev
Log:
Resolve crash during graceful restarts.

PR: 50309
Submitted by: Mario Brandt <JBlond gmail.com>

Modified:
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
    httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c?rev=1234169&r1=1234168&r2=1234169&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_main.c Fri Jan 20 22:02:50 2012
@@ -375,7 +375,6 @@ static int reclaim_one_pid(server_rec *m
         proc->diewhy = FCGID_DIE_SHUTDOWN;
         proc_print_exit_info(proc, exitcode, exitwhy,
                              main_server);
-        apr_pool_destroy(proc->proc_pool);
         proc->proc_pool = NULL;
         return 1;
     }

Modified: httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c
URL: http://svn.apache.org/viewvc/httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c?rev=1234169&r1=1234168&r2=1234169&view=diff
==============================================================================
--- httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c (original)
+++ httpd/mod_fcgid/trunk/modules/fcgid/fcgid_pm_win.c Fri Jan 20 22:02:50 2012
@@ -248,8 +248,8 @@ apr_status_t procmgr_peek_cmd(fcgid_comm
 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);
+    /* Noop on windows, but used by unix */
+
     return APR_SUCCESS;
 }
 



Mime
View raw message