From: Ilia Alshanetsky <iliaa@php.net>
Date: Thu, 17 Nov 2005 21:01:13 +0000 (+0000)
Subject: MFH: Resolve Apache 2 regression with sub-request handling on non-linux
X-Git-Tag: php-4.4.2RC1~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85bf21aba8caa58fe1afb2e2d9281960ebb8d488;p=php

MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
---

diff --git a/NEWS b/NEWS
index 048a4d002e..a244071986 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP 4                                                                      NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 ?? ??? 2006, Version 4.4.2
+- Resolve Apache 2 regression with sub-request handling on non-linux systems.
+  (Ilia, Tony)
 - Backport missing imap_mailcompose fixes from 5.X. (Ilia)
 - Added missing safe_mode/open_basedir checks in cURL extension. (Ilia)
 - Fixed bug #35257 (Calling ob_flush after creating an ob callback causes 
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index 19f655273e..b4b3d4179c 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -457,6 +457,7 @@ static int php_handler(request_rec *r)
 	if (strcmp(r->protocol, "INCLUDED")) { \
 		zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \
 	} \
+	apr_pool_cleanup_run(r->pool, (void *)&SG(server_context), php_server_context_cleanup); \
 
 	conf = ap_get_module_config(r->per_dir_config, &php4_module);