diff options
| author | Ilia Alshanetsky <iliaa@php.net> | 2005-11-17 21:00:28 +0000 |
|---|---|---|
| committer | Ilia Alshanetsky <iliaa@php.net> | 2005-11-17 21:00:28 +0000 |
| commit | 8f514cd18ca96b9c67bb123dec067b002a75a74c (patch) | |
| tree | 16ecda43bb6f2f0876b3a40c1554b6178aad030b | |
| parent | 1340c049769e280857d94d170f0f05aa47751e90 (diff) | |
| download | php-git-8f514cd18ca96b9c67bb123dec067b002a75a74c.tar.gz | |
MFH: Resolve Apache 2 regression with sub-request handling on non-linux
systems.
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/apache2handler/sapi_apache2.c | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -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); |