Rename gpc_globals to register_globals

diff --git a/main/main.c b/main/main.c
index fa10a9aa03299033722ac426909c0ee7a980db4d..2c1789c38514f08e4a6a1e23ae69f5922b739479 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -250,7 +250,7 @@ PHP_INI_BEGIN()
        STD_PHP_INI_BOOLEAN("track_vars",                       "0",                    PHP_INI_ALL,            OnUpdateBool,                           track_vars,             php_core_globals,       core_globals)
 #endif
 
-       STD_PHP_INI_BOOLEAN("gpc_globals",                      "1",                    PHP_INI_ALL,            OnUpdateBool,                           gpc_globals,    php_core_globals,       core_globals)
+       STD_PHP_INI_BOOLEAN("register_globals",                 "1",                    PHP_INI_ALL,            OnUpdateBool,                           gpc_globals,    php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("gpc_order",                          "GPC",                  PHP_INI_ALL,            OnUpdateStringUnempty,  gpc_order,                      php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("variables_order",            NULL,                   PHP_INI_ALL,            OnUpdateStringUnempty,  variables_order,        php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("arg_separator",                      "&",                    PHP_INI_ALL,            OnUpdateStringUnempty,  arg_separator,          php_core_globals,       core_globals)
@@ -1010,7 +1010,7 @@ static inline void php_register_server_variables(ELS_D SLS_DC PLS_DC)
 }
 
 
-static int zend_hash_environment(ELS_D SLS_DC PLS_DC)
+static int php_hash_environment(ELS_D SLS_DC PLS_DC)
 {
        char *p;
        unsigned char _gpc_flags[3] = {0,0,0};
@@ -1135,7 +1135,7 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
        zend_file_handle prepend_file, append_file;
        SLS_FETCH();
 
-       zend_hash_environment(ELS_C SLS_CC PLS_CC);
+       php_hash_environment(ELS_C SLS_CC PLS_CC);
        zend_activate_modules();
        if (SG(request_info).query_string && SG(request_info).query_string[0]=='=' 
                && PG(expose_php)) {