summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS2
-rw-r--r--sapi/apache2handler/sapi_apache2.c1
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 44b9b5e676..6272fcb75d 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 c2952c4255..d74ff58730 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);