diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 4 | ||||
| -rw-r--r-- | main/php_ini.c | 3 |
2 files changed, 1 insertions, 6 deletions
diff --git a/main/main.c b/main/main.c index 4745fc78f9..4bc65c5ecf 100644 --- a/main/main.c +++ b/main/main.c @@ -103,10 +103,6 @@ static void php_build_argv(char *s, zval *track_vars_array ELS_DC PLS_DC); void *gLock; /*mutex variable */ - -/* True globals (no need for thread safety) */ -HashTable configuration_hash; - #define SAFE_FILENAME(f) ((f)?(f):"-") static PHP_INI_MH(OnSetPrecision) diff --git a/main/php_ini.c b/main/php_ini.c index 0a0fc04bd2..ce1b330156 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -136,8 +136,7 @@ static void php_config_ini_parser_cb(zval *arg1, zval *arg2, int callback_type, } else { zend_hash_update(&configuration_hash, Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, arg2, sizeof(zval), (void **) &entry); Z_STRVAL_P(entry) = zend_strndup(Z_STRVAL_P(entry), Z_STRLEN_P(entry)); - php_alter_ini_entry(Z_STRVAL_P(arg1), Z_STRLEN_P(arg1)+1, Z_STRVAL_P(arg2), Z_STRLEN_P(arg2)+1, PHP_INI_SYSTEM, PHP_INI_STAGE_STARTUP); - } + } } break; case ZEND_INI_PARSER_SECTION: |