Revert

diff --git a/main/main.c b/main/main.c
index 6d275d159916584f8f2702ce58a6e3dcfff52b8a..cb58163e24f1dcd33335852ad73d59063b73a3c8 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -1415,17 +1415,6 @@ 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) {
-               return FAILURE;
-       }
-       
-       /* Register PHP core ini entries */
-       REGISTER_INI_ENTRIES();
-       
-       /* 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 */
@@ -1433,6 +1422,12 @@ int php_module_startup(sapi_module_struct *sf, zend_module_entry *additional_mod
                return FAILURE;
        }
 
+       /* Register PHP core ini entries */
+       REGISTER_INI_ENTRIES();
+
+       /* Register Zend ini entries */
+       zend_register_standard_ini_entries(TSRMLS_C);
+
        /* Disable realpath cache if safe_mode or open_basedir are set */
        if (PG(safe_mode) || (PG(open_basedir) && *PG(open_basedir))) {
                CWDG(realpath_cache_size_limit) = 0;

diff --git a/main/php_ini.c b/main/php_ini.c
index 82db68c6adb2546ff09a8380ff36bd025e9c0f3b..a720127aa2655e09027223fff7f140f9cddb2fb2 100644 (file)
--- 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 1b3c7a0f5be245264b6a03b7e5abbb9141a16df7..ed630d96d156848f45aa3d03bce4b503c0c5629c 100644 (file)
--- 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);