From 8f514cd18ca96b9c67bb123dec067b002a75a74c Mon Sep 17 00:00:00 2001 From: Ilia Alshanetsky Date: Thu, 17 Nov 2005 21:00:28 +0000 Subject: [PATCH] MFH: Resolve Apache 2 regression with sub-request handling on non-linux systems. --- NEWS | 2 ++ sapi/apache2handler/sapi_apache2.c | 1 + 2 files changed, 3 insertions(+) diff --git a/NEWS b/NEWS index 44b9b5e6763..6272fcb75db 100644 --- 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 c2952c4255b..d74ff58730b 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, &php5_module);