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

systems.

diff --git a/NEWS b/NEWS
index 44b9b5e6763cfe4b9b666602f1b5ec787d65af7f..6272fcb75db887f020bd57a8f005f5764e0eb71d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
 PHP                                                                        NEWS
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
 17 Nov 2005, PHP 5.1 Release Candidate 6
+- Resolve Apache 2 regression with sub-request handling on non-linux systems.
+  (Ilia, Tony)
 - Make zend_parse_params handle integers in a non-strict fashion, but emit an 
   E_NOTICE on non well formed interger values. (Ilia)
 - Fixed bug #35249 (compile failure when ext/readline is compiled as shared).

diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index c2952c4255b31b306dfa0423382ccefb9f11765a..d74ff58730bd2848134061d93a0208059cd77d68 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, &php5_module);