diff options
| author | Dmitry Stogov <dmitry@php.net> | 2006-11-08 11:04:27 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2006-11-08 11:04:27 +0000 |
| commit | a84a2eae6a2d8f47728bad933381fc82cd354f3d (patch) | |
| tree | 78e4ee4ddf7c77417695949d11b003470f590189 /Zend/zend.c | |
| parent | 84b9dcb73f11ea4fd29a9cecc31accf3757b61a6 (diff) | |
| download | php-git-a84a2eae6a2d8f47728bad933381fc82cd354f3d.tar.gz | |
Fixed bug #39344 (Unnecessary calls to OnModify callback routine for an extension INI directive). (wharmby at uk dot ibm dot com, Dmitry)
Diffstat (limited to 'Zend/zend.c')
| -rw-r--r-- | Zend/zend.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Zend/zend.c b/Zend/zend.c index 9b1f6e3fb4..ee8b4b767f 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -522,8 +522,9 @@ static void executor_globals_dtor(zend_executor_globals *executor_globals TSRMLS 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 @@ void zend_post_startup(TSRMLS_D) 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 |