- This ini option is only effective when set in php.ini or httpd.conf

  or .htacces, etc. as GPC variables are set before any ini_set() is called

diff --git a/main/main.c b/main/main.c
index e1a4e111f118210ebac558266992d7803dc3070b..71bcd366cb69e7c5f32cb678624dfe2645be4b65 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -302,7 +302,7 @@ PHP_INI_BEGIN()
        STD_PHP_INI_ENTRY("upload_tmp_dir",                     NULL,           PHP_INI_SYSTEM,         OnUpdateStringUnempty,  upload_tmp_dir,                 php_core_globals,       core_globals)
 
        STD_PHP_INI_ENTRY("user_dir",                           NULL,           PHP_INI_SYSTEM,         OnUpdateString,                 user_dir,                               php_core_globals,       core_globals)
-       STD_PHP_INI_ENTRY("variables_order",            "EGPCS",        PHP_INI_ALL,            OnUpdateStringUnempty,  variables_order,                php_core_globals,       core_globals)
+       STD_PHP_INI_ENTRY("variables_order",            "EGPCS",        PHP_INI_SYSTEM|PHP_INI_PERDIR,          OnUpdateStringUnempty,  variables_order,                php_core_globals,       core_globals)
 
        STD_PHP_INI_ENTRY("error_append_string",        NULL,           PHP_INI_ALL,            OnUpdateString,                 error_append_string,    php_core_globals,       core_globals)
        STD_PHP_INI_ENTRY("error_prepend_string",       NULL,           PHP_INI_ALL,            OnUpdateString,                 error_prepend_string,   php_core_globals,       core_globals)