diff options
| author | foobar <sniper@php.net> | 2005-09-02 14:05:46 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2005-09-02 14:05:46 +0000 |
| commit | 1890173d8cf36566c6ed2ae2e0912b2e5c805f74 (patch) | |
| tree | dbea0f28de51fa3bfc50f11d8272635ad6e83a4e /main/php_ini.c | |
| parent | 8c4d1f66573863a3bd6131b8912ff3a279fa002e (diff) | |
| download | php-git-1890173d8cf36566c6ed2ae2e0912b2e5c805f74.tar.gz | |
Revert
Diffstat (limited to 'main/php_ini.c')
| -rw-r--r-- | main/php_ini.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/main/php_ini.c b/main/php_ini.c index 82db68c6ad..a720127aa2 100644 --- a/main/php_ini.c +++ b/main/php_ini.c @@ -254,14 +254,6 @@ static void pvalue_config_destructor(zval *pvalue) } /* }}} */ -/* {{{ php_init_config_hash - */ -int php_init_config_hash(void) -{ - return zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1); -} -/* }}} */ - /* {{{ php_init_config */ int php_init_config(TSRMLS_D) @@ -278,6 +270,10 @@ int php_init_config(TSRMLS_D) int l, total_l=0; zend_llist_element *element; + if (zend_hash_init(&configuration_hash, 0, NULL, (dtor_func_t) pvalue_config_destructor, 1) == FAILURE) { + return FAILURE; + } + if (sapi_module.ini_defaults) { sapi_module.ini_defaults(&configuration_hash); } |