cvs: /php4 main.c

zeev Fri Jan 28 09:44:11 2000 EDT Modified files: /php4 main.c Log: Rename gpc_globals to register_globals Index: php4/main.c diff -u php4/main.c:1.184 php4/main.c:1.185 --- php4/main.c:1.184 Fri Jan 28 09:29:37 2000 +++ php4/main.c Fri Jan 28 09:43:41 2000 @@ -19,7 +19,7 @@ */ -/* $Id: main.c,v 1.184 2000/01/28 17:29:37 andrei Exp $ */ +/* $Id: main.c,v 1.185 2000/01/28 17:43:41 zeev Exp $ */ #include <stdio.h> @@ -250,7 +250,7 @@ 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 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 @@ 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)) {