cvs: php-src(PHP_5_2) / NEWS /sapi/apache2handler sapi_apache2.c

iliaa Tue Dec 12 18:05:25 2006 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /php-src/sapi/apache2handler sapi_apache2.c Log: Fixed bug #39797 (virtual() does not reset changed INI settings). http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.426&r2=1.2027.2.547.2.427&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.426 php-src/NEWS:1.2027.2.547.2.427 --- php-src/NEWS:1.2027.2.547.2.426 Tue Dec 12 07:38:04 2006 +++ php-src/NEWS Tue Dec 12 18:05:25 2006 @@ -50,6 +50,7 @@ - Fixed FastCGI impersonation for persistent connections on Windows. (Dmitry) - Fixed wrong signature initialization in imagepng (Takeshi Abe) - Added optimization for imageline with horizontal and vertial lines (Pierre) +- Fixed bug #39797 (virtual() does not reset changed INI settings). (Ilia) - Fixed bug #39795 (build fails on AIX because crypt_r() uses different data struct). (Tony) - Fixed bug #39791 (Crash in strtotime() on overly long relative date http://cvs.php.net/viewvc.cgi/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.57.2.10.2.9&r2=1.57.2.10.2.10&diff_format=u Index: php-src/sapi/apache2handler/sapi_apache2.c diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.9 php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.10 --- php-src/sapi/apache2handler/sapi_apache2.c:1.57.2.10.2.9 Thu Nov 9 19:10:12 2006 +++ php-src/sapi/apache2handler/sapi_apache2.c Tue Dec 12 18:05:25 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: sapi_apache2.c,v 1.57.2.10.2.9 2006/11/09 19:10:12 iliaa Exp $ */ +/* $Id: sapi_apache2.c,v 1.57.2.10.2.10 2006/12/12 18:05:25 iliaa Exp $ */ #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS @@ -467,6 +467,20 @@ { if (strcmp(r->protocol, "INCLUDED")) { zend_try { zend_ini_deactivate(TSRMLS_C); } zend_end_try(); + } else { +typedef struct { + HashTable config; +} php_conf_rec; + char *str; + uint str_len; + php_conf_rec *c = ap_get_module_config(r->per_dir_config, &php5_module); + + for (zend_hash_internal_pointer_reset(&c->config); + zend_hash_get_current_key_ex(&c->config, &str, &str_len, NULL, 0, NULL) == HASH_KEY_IS_STRING; + zend_hash_move_forward(&c->config) + ) { + zend_restore_ini_entry(str, str_len, ZEND_INI_STAGE_SHUTDOWN); + } } if (p) { ((php_struct *)SG(server_context))->r = p;