register_globals=off is defualt for 4.2.0

diff --git a/main/main.c b/main/main.c
index e6844cc9416bed45c62b69a65fd7da3472e483fe..b770ccfe3e8bfeb6f13d414d0e7a6e10a6af24f4 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -230,7 +230,7 @@ PHP_INI_BEGIN()
        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

diff --git a/php.ini-dist b/php.ini-dist
index dffd8e0d5539951e666b83259e1a51f0c34352f4..8c72efc889565c802bf550113622e12119387e09 100644 (file)
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -309,7 +309,7 @@ variables_order = "EGPCS"
 ; 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