cvs: php4 / php.ini-dist /main main.c

yohgaki Tue Feb 5 01:31:54 2002 EDT Modified files: /php4 php.ini-dist /php4/main main.c Log: register_globals=off is defualt for 4.2.0 Index: php4/php.ini-dist diff -u php4/php.ini-dist:1.108 php4/php.ini-dist:1.109 --- php4/php.ini-dist:1.108 Thu Jan 24 19:51:02 2002 +++ php4/php.ini-dist Tue Feb 5 01:31:53 2002 @@ -309,7 +309,7 @@ ; You should do your best to write your scripts so that they do not require ; register_globals to be on; Using form variables as globals can easily lead ; to possible security problems, if the code is not very well thought of. -register_globals = On +register_globals = Off ; This directive tells PHP whether to declare the argv&argc variables (that ; would contain the GET information). If you don't use these variables, you Index: php4/main/main.c diff -u php4/main/main.c:1.420 php4/main/main.c:1.421 --- php4/main/main.c:1.420 Wed Jan 30 19:05:07 2002 +++ php4/main/main.c Tue Feb 5 01:31:53 2002 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.420 2002/01/31 00:05:07 edink Exp $ */ +/* $Id: main.c,v 1.421 2002/02/05 06:31:53 yohgaki Exp $ */ /* {{{ includes */ @@ -230,7 +230,7 @@ STD_PHP_INI_ENTRY("output_buffering", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateInt, output_buffering, php_core_globals, core_globals) STD_PHP_INI_ENTRY("output_handler", NULL, PHP_INI_PERDIR|PHP_INI_SYSTEM,OnUpdateString, output_handler, php_core_globals, core_globals) STD_PHP_INI_BOOLEAN("register_argc_argv", "1", PHP_INI_ALL, OnUpdateBool, register_argc_argv, php_core_globals, core_globals) - STD_PHP_INI_BOOLEAN("register_globals", "1", PHP_INI_ALL, OnUpdateBool, register_globals, php_core_globals, core_globals) + STD_PHP_INI_BOOLEAN("register_globals", "0", PHP_INI_ALL, OnUpdateBool, register_globals, php_core_globals, core_globals) #if PHP_SAFE_MODE STD_PHP_INI_BOOLEAN("safe_mode", "1", PHP_INI_SYSTEM, OnUpdateBool, safe_mode, php_core_globals, core_globals) #else