tony2001 Fri Jun 1 10:02:41 2007 UTC
Modified files:
/php-src/sapi/apache2handler sapi_apache2.c
Log:
fix #39330 (apache2handler does not call shutdown actions before apache child
die)
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.82&r2=1.83&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.82
php-src/sapi/apache2handler/sapi_apache2.c:1.83
--- php-src/sapi/apache2handler/sapi_apache2.c:1.82 Wed Feb 7 09:35:09 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Jun 1 10:02:41 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.82 2007/02/07 09:35:09 tony2001 Exp $ */
+/* $Id: sapi_apache2.c,v 1.83 2007/06/01 10:02:41 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -646,11 +646,17 @@
return OK;
}
+static void php_apache_child_init(apr_pool_t *pchild, server_rec *s)
+{
+ apr_pool_cleanup_register(pchild, NULL, php_apache_server_shutdown,
apr_pool_cleanup_null);
+}
+
void php_ap2_register_hook(apr_pool_t *p)
{
ap_hook_pre_config(php_pre_config, NULL, NULL, APR_HOOK_MIDDLE);
ap_hook_post_config(php_apache_server_startup, NULL, NULL,
APR_HOOK_MIDDLE);
ap_hook_handler(php_handler, NULL, NULL, APR_HOOK_MIDDLE);
+ ap_hook_child_init(php_apache_child_init, NULL, NULL, APR_HOOK_MIDDLE);
}
/*
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
