From: Antony Dovgal <tony2001@php.net>
Date: Fri, 1 Jun 2007 10:02:41 +0000 (+0000)
Subject: fix #39330 (apache2handler does not call shutdown actions before apache child die)
X-Git-Tag: BEFORE_IMPORT_OF_MYSQLND~564
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b1a7a9f261c1ae2b8e316ef4486bfa407bdd7668;p=php

fix #39330 (apache2handler does not call shutdown actions before apache child die)
---

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index b61030bcbb..1ee58e4936 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -646,11 +646,17 @@ zend_first_try {
 	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);
 }
 
 /*