cvs: php-src /main main.c

sniper Fri Aug 5 17:44:27 2005 EDT Modified files: /php-src/main main.c Log: - 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 http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.639&r2=1.640&ty=u Index: php-src/main/main.c diff -u php-src/main/main.c:1.639 php-src/main/main.c:1.640 --- php-src/main/main.c:1.639 Wed Aug 3 10:08:30 2005 +++ php-src/main/main.c Fri Aug 5 17:44:26 2005 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: main.c,v 1.639 2005/08/03 14:08:30 sniper Exp $ */ +/* $Id: main.c,v 1.640 2005/08/05 21:44:26 sniper Exp $ */ /* {{{ includes */ @@ -302,7 +302,7 @@ 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)