From 7d92b356d9846c632c09331afac44e3be83687f6 Mon Sep 17 00:00:00 2001 From: foobar Date: Fri, 2 Sep 2005 14:08:09 +0000 Subject: [PATCH] revert --- main/main.c | 13 ++++--------- main/php_ini.c | 12 ++++-------- main/php_ini.h | 1 - 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/main/main.c b/main/main.c index 0a7339f323..aad569f0e5 100644 --- a/main/main.c +++ b/main/main.c @@ -1535,8 +1535,10 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod le_index_ptr = zend_register_list_destructors_ex(NULL, NULL, "index pointer", 0); - /* Initialize configuration_hash */ - if (php_init_config_hash() == FAILURE) { + /* this will read in php.ini, set up the configuration parameters, + load zend extensions and register php function extensions + to be loaded later */ + if (php_init_config(TSRMLS_C) == FAILURE) { return FAILURE; } @@ -1546,13 +1548,6 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod /* Register Zend ini entries */ zend_register_standard_ini_entries(TSRMLS_C); - /* this will read in php.ini, set up the configuration parameters, - load zend extensions and register php function extensions - to be loaded later */ - if (php_init_config(TSRMLS_C) == FAILURE) { - return FAILURE; - } - orig_unicode = UG(unicode); UG(unicode) = 0; 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); } diff --git a/main/php_ini.h b/main/php_ini.h index 1b3c7a0f5b..ed630d96d1 100644 --- a/main/php_ini.h +++ b/main/php_ini.h @@ -24,7 +24,6 @@ #include "zend_ini.h" BEGIN_EXTERN_C() -int php_init_config_hash(void); int php_init_config(TSRMLS_D); int php_shutdown_config(void); void php_ini_register_extensions(TSRMLS_D); -- 2.40.0