archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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

Browse source 
systems.
This commit is contained in:
Ilia Alshanetsky 2005-11-17 21:00:28 +00:00
parent 1340c04976
commit 8f514cd18c
2 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
NEWS
View file

@ -1,6 +1,8 @@
PHP NEWS PHP NEWS
||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
17 Nov 2005, PHP 5.1 Release Candidate 6 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 - Make zend_parse_params handle integers in a non-strict fashion, but emit an
E_NOTICE on non well formed interger values. (Ilia) E_NOTICE on non well formed interger values. (Ilia)
- Fixed bug #35249 (compile failure when ext/readline is compiled as shared). - Fixed bug #35249 (compile failure when ext/readline is compiled as shared).

1
sapi/apache2handler/sapi_apache2.c
View file

@ -457,6 +457,7 @@ static int php_handler(request_rec *r)
if (strcmp(r->protocol, "INCLUDED")) { \ if (strcmp(r->protocol, "INCLUDED")) { \
zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); \ 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); conf = ap_get_module_config(r->per_dir_config, &php5_module);