cvs: ZendEngine2(PHP_5_2) / zend.c zend_ini.c php-src NEWS

dmitry Wed Nov 8 11:04:28 2006 UTC Modified files: (Branch: PHP_5_2) /php-src NEWS /ZendEngine2 zend.c zend_ini.c Log: Fixed bug #39344 (Unnecessary calls to OnModify callback routine for an extension INI directive). (wharmby at uk dot ibm dot com, Dmitry) http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.338&r2=1.2027.2.547.2.339&diff_format=u Index: php-src/NEWS diff -u php-src/NEWS:1.2027.2.547.2.338 php-src/NEWS:1.2027.2.547.2.339 --- php-src/NEWS:1.2027.2.547.2.338 Wed Nov 8 10:05:19 2006 +++ php-src/NEWS Wed Nov 8 11:04:27 2006 @@ -26,6 +26,8 @@ (Ilia) - Fixed bug #39354 (Allow building of curl extension against libcurl 7.16.0) (Ilia) +- Fixed bug #39344 (Unnecessary calls to OnModify callback routine for + an extension INI directive). (wharmby at uk dot ibm dot com, Dmitry) - Fixed bug #39320 (ZEND_HASH_APPLY_STOP causes deletion). (Marcus) - Fixed bug #39313 (spl_autoload triggers Fatal error). (Marcus) - Fixed bug #39265 (Fixed path handling inside mod_files.sh). http://cvs.php.net/viewvc.cgi/ZendEngine2/zend.c?r1=1.308.2.12.2.23&r2=1.308.2.12.2.24&diff_format=u Index: ZendEngine2/zend.c diff -u ZendEngine2/zend.c:1.308.2.12.2.23 ZendEngine2/zend.c:1.308.2.12.2.24 --- ZendEngine2/zend.c:1.308.2.12.2.23 Fri Nov 3 19:01:40 2006 +++ ZendEngine2/zend.c Wed Nov 8 11:04:27 2006 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.c,v 1.308.2.12.2.23 2006/11/03 19:01:40 helly Exp $ */ +/* $Id: zend.c,v 1.308.2.12.2.24 2006/11/08 11:04:27 dmitry Exp $ */ #include "zend.h" #include "zend_extensions.h" @@ -522,8 +522,9 @@ static void zend_new_thread_end_handler(THREAD_T thread_id TSRMLS_DC) { - zend_copy_ini_directives(TSRMLS_C); - zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP TSRMLS_CC); + if (zend_copy_ini_directives(TSRMLS_C) == SUCCESS) { + zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP TSRMLS_CC); + } } #endif @@ -700,7 +701,7 @@ free(EG(zend_constants)); executor_globals_ctor(executor_globals, tsrm_ls); global_persistent_list = &EG(persistent_list); - zend_new_thread_end_handler(tsrm_thread_id() TSRMLS_CC); + zend_copy_ini_directives(TSRMLS_C); } #endif http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_ini.c?r1=1.39.2.2.2.3&r2=1.39.2.2.2.4&diff_format=u Index: ZendEngine2/zend_ini.c diff -u ZendEngine2/zend_ini.c:1.39.2.2.2.3 ZendEngine2/zend_ini.c:1.39.2.2.2.4 --- ZendEngine2/zend_ini.c:1.39.2.2.2.3 Wed Sep 6 08:54:44 2006 +++ ZendEngine2/zend_ini.c Wed Nov 8 11:04:27 2006 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_ini.c,v 1.39.2.2.2.3 2006/09/06 08:54:44 dmitry Exp $ */ +/* $Id: zend_ini.c,v 1.39.2.2.2.4 2006/11/08 11:04:27 dmitry Exp $ */ #include "zend.h" #include "zend_qsort.h" @@ -126,7 +126,6 @@ return FAILURE; } zend_hash_copy(EG(ini_directives), registered_zend_ini_directives, NULL, &ini_entry, sizeof(zend_ini_entry)); - zend_ini_refresh_caches(ZEND_INI_STAGE_STARTUP TSRMLS_CC); return SUCCESS; } #endif @@ -214,6 +213,7 @@ } +#ifdef ZTS static int zend_ini_refresh_cache(zend_ini_entry *p, int stage TSRMLS_DC) { if (p->on_modify) { @@ -227,6 +227,7 @@ { zend_hash_apply_with_argument(EG(ini_directives), (apply_func_arg_t) zend_ini_refresh_cache, (void *)(long) stage TSRMLS_CC); } +#endif ZEND_API int zend_alter_ini_entry(char *name, uint name_length, char *new_value, uint new_value_length, int modify_type, int stage)