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

systems.

diff --git a/NEWS b/NEWS
index 048a4d002ea0b77bbfcdf41b6739492d25489f0c..a24407198661a89be89069d33f85bc1e32aea2a7 100644 (file)
--- 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 19f655273ea98453b77601d0c76f31cf9ec54ba0..b4b3d4179cf3d6bec092a9de68c3c7250aecfcf9 100644 (file)
--- 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);