tony2001 Fri Jun 1 10:04:06 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/php-src/sapi/apache2handler sapi_apache2.c
Log:
MFH: fix #39330 (apache2handler does not call shutdown actions before apache
child die)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.747&r2=1.2027.2.547.2.748&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.747 php-src/NEWS:1.2027.2.547.2.748
--- php-src/NEWS:1.2027.2.547.2.747 Wed May 30 18:48:58 2007
+++ php-src/NEWS Fri Jun 1 10:04:05 2007
@@ -1,6 +1,8 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2007, PHP 5.2.4
+- Fixed bug #39330 (apache2handler does not call shutdown actions before
+ apache child die). (isk at ecommerce dot com, Gopal, Tony)
31 May 2007, PHP 5.2.3
- Changed CGI install target to php-cgi and 'make install' to install CLI
http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.13&r2=1.57.2.10.2.14&diff_format=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.13
php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.14
--- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.13 Mon Jan 1
09:36:12 2007
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Jun 1 10:04:06 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.57.2.10.2.13 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: sapi_apache2.c,v 1.57.2.10.2.14 2007/06/01 10:04:06 tony2001 Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -651,11 +651,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
