Modified: xdebug/branches/xdebug_2_1/tests/assignment-trace2.phpt =================================================================== --- xdebug/branches/xdebug_2_1/tests/assignment-trace2.phpt 2011-02-11 00:15:54 UTC (rev 3394) +++ xdebug/branches/xdebug_2_1/tests/assignment-trace2.phpt 2011-02-11 00:15:55 UTC (rev 3395) @@ -10,6 +10,7 @@ xdebug.collect_return=0 xdebug.collect_assignments=1 xdebug.dump.GET= +xdebug.dump.SERVER= --FILE-- +--EXPECT-- +Notice: foo in %sdump-superglobal1.php on line 2 + +Call Stack: + 0.0001 669992 1. {main}() %sdump-superglobal1.php:0 + 0.0002 670320 2. trigger_error('foo') %sdump-superglobal1.php:2 + +Dump $_SERVER + $_SERVER['argc'] = 1 +------------- + +Notice: foo in %sdump-superglobal1.php on line 6 + +Call Stack: + 0.0001 669992 1. {main}() %sdump-superglobal1.php:0 + 0.0003 671072 2. trigger_error('foo') %sdump-superglobal1.php:6 + +------------- + +Notice: foo in %sdump-superglobal1.php on line 10 + +Call Stack: + 0.0001 669992 1. {main}() %sdump-superglobal1.php:0 + 0.0003 671080 2. trigger_error('foo') %sdump-superglobal1.php:10 + +Dump $_SERVER + $_SERVER['argc'] = 1 + $_SERVER['argv'] = array (0 => '%sdump-superglobal1.php') Modified: xdebug/branches/xdebug_2_1/xdebug.c =================================================================== --- xdebug/branches/xdebug_2_1/xdebug.c 2011-02-11 00:15:54 UTC (rev 3394) +++ xdebug/branches/xdebug_2_1/xdebug.c 2011-02-11 00:15:55 UTC (rev 3395) @@ -256,14 +256,14 @@ STD_PHP_INI_BOOLEAN("xdebug.show_mem_delta", "0", PHP_INI_ALL, OnUpdateBool, show_mem_delta, zend_xdebug_globals, xdebug_globals) /* Dump superglobals settings */ - PHP_INI_ENTRY("xdebug.dump.cookie", NULL, PHP_INI_ALL, OnUpdateCookie) - PHP_INI_ENTRY("xdebug.dump.env", NULL, PHP_INI_ALL, OnUpdateEnv) - PHP_INI_ENTRY("xdebug.dump.files", NULL, PHP_INI_ALL, OnUpdateFiles) - PHP_INI_ENTRY("xdebug.dump.get", NULL, PHP_INI_ALL, OnUpdateGet) - PHP_INI_ENTRY("xdebug.dump.post", NULL, PHP_INI_ALL, OnUpdatePost) - PHP_INI_ENTRY("xdebug.dump.request", NULL, PHP_INI_ALL, OnUpdateRequest) - PHP_INI_ENTRY("xdebug.dump.server", NULL, PHP_INI_ALL, OnUpdateServer) - PHP_INI_ENTRY("xdebug.dump.session", NULL, PHP_INI_ALL, OnUpdateSession) + PHP_INI_ENTRY("xdebug.dump.COOKIE", NULL, PHP_INI_ALL, OnUpdateCookie) + PHP_INI_ENTRY("xdebug.dump.ENV", NULL, PHP_INI_ALL, OnUpdateEnv) + PHP_INI_ENTRY("xdebug.dump.FILES", NULL, PHP_INI_ALL, OnUpdateFiles) + PHP_INI_ENTRY("xdebug.dump.GET", NULL, PHP_INI_ALL, OnUpdateGet) + PHP_INI_ENTRY("xdebug.dump.POST", NULL, PHP_INI_ALL, OnUpdatePost) + PHP_INI_ENTRY("xdebug.dump.REQUEST", NULL, PHP_INI_ALL, OnUpdateRequest) + PHP_INI_ENTRY("xdebug.dump.SERVER", NULL, PHP_INI_ALL, OnUpdateServer) + PHP_INI_ENTRY("xdebug.dump.SESSION", NULL, PHP_INI_ALL, OnUpdateSession) STD_PHP_INI_BOOLEAN("xdebug.dump_globals", "1", PHP_INI_ALL, OnUpdateBool, dump_globals, zend_xdebug_globals, xdebug_globals) STD_PHP_INI_BOOLEAN("xdebug.dump_once", "1", PHP_INI_ALL, OnUpdateBool, dump_once, zend_xdebug_globals, xdebug_globals) STD_PHP_INI_BOOLEAN("xdebug.dump_undefined", "0", PHP_INI_ALL, OnUpdateBool, dump_undefined, zend_xdebug_globals, xdebug_globals) Modified: xdebug/trunk/tests/assignment-trace2.phpt =================================================================== --- xdebug/trunk/tests/assignment-trace2.phpt 2011-02-11 00:15:54 UTC (rev 3394) +++ xdebug/trunk/tests/assignment-trace2.phpt 2011-02-11 00:15:55 UTC (rev 3395) @@ -10,6 +10,7 @@ xdebug.collect_return=0 xdebug.collect_assignments=1 xdebug.dump.GET= +xdebug.dump.SERVER= --FILE-- +--EXPECT-- +Notice: foo in %sdump-superglobal1.php on line 2 + +Call Stack: + 0.0001 669992 1. {main}() %sdump-superglobal1.php:0 + 0.0002 670320 2. trigger_error('foo') %sdump-superglobal1.php:2 + +Dump $_SERVER + $_SERVER['argc'] = 1 +------------- + +Notice: foo in %sdump-superglobal1.php on line 6 + +Call Stack: + 0.0001 669992 1. {main}() %sdump-superglobal1.php:0 + 0.0003 671072 2. trigger_error('foo') %sdump-superglobal1.php:6 + +------------- + +Notice: foo in %sdump-superglobal1.php on line 10 + +Call Stack: + 0.0001 669992 1. {main}() %sdump-superglobal1.php:0 + 0.0003 671080 2. trigger_error('foo') %sdump-superglobal1.php:10 + +Dump $_SERVER + $_SERVER['argc'] = 1 + $_SERVER['argv'] = array (0 => '%sdump-superglobal1.php') Modified: xdebug/trunk/xdebug.c =================================================================== --- xdebug/trunk/xdebug.c 2011-02-11 00:15:54 UTC (rev 3394) +++ xdebug/trunk/xdebug.c 2011-02-11 00:15:55 UTC (rev 3395) @@ -257,14 +257,14 @@ STD_PHP_INI_BOOLEAN("xdebug.show_mem_delta", "0", PHP_INI_ALL, OnUpdateBool, show_mem_delta, zend_xdebug_globals, xdebug_globals) /* Dump superglobals settings */ - PHP_INI_ENTRY("xdebug.dump.cookie", NULL, PHP_INI_ALL, OnUpdateCookie) - PHP_INI_ENTRY("xdebug.dump.env", NULL, PHP_INI_ALL, OnUpdateEnv) - PHP_INI_ENTRY("xdebug.dump.files", NULL, PHP_INI_ALL, OnUpdateFiles) - PHP_INI_ENTRY("xdebug.dump.get", NULL, PHP_INI_ALL, OnUpdateGet) - PHP_INI_ENTRY("xdebug.dump.post", NULL, PHP_INI_ALL, OnUpdatePost) - PHP_INI_ENTRY("xdebug.dump.request", NULL, PHP_INI_ALL, OnUpdateRequest) - PHP_INI_ENTRY("xdebug.dump.server", NULL, PHP_INI_ALL, OnUpdateServer) - PHP_INI_ENTRY("xdebug.dump.session", NULL, PHP_INI_ALL, OnUpdateSession) + PHP_INI_ENTRY("xdebug.dump.COOKIE", NULL, PHP_INI_ALL, OnUpdateCookie) + PHP_INI_ENTRY("xdebug.dump.ENV", NULL, PHP_INI_ALL, OnUpdateEnv) + PHP_INI_ENTRY("xdebug.dump.FILES", NULL, PHP_INI_ALL, OnUpdateFiles) + PHP_INI_ENTRY("xdebug.dump.GET", NULL, PHP_INI_ALL, OnUpdateGet) + PHP_INI_ENTRY("xdebug.dump.POST", NULL, PHP_INI_ALL, OnUpdatePost) + PHP_INI_ENTRY("xdebug.dump.REQUEST", NULL, PHP_INI_ALL, OnUpdateRequest) + PHP_INI_ENTRY("xdebug.dump.SERVER", NULL, PHP_INI_ALL, OnUpdateServer) + PHP_INI_ENTRY("xdebug.dump.SESSION", NULL, PHP_INI_ALL, OnUpdateSession) STD_PHP_INI_BOOLEAN("xdebug.dump_globals", "1", PHP_INI_ALL, OnUpdateBool, dump_globals, zend_xdebug_globals, xdebug_globals) STD_PHP_INI_BOOLEAN("xdebug.dump_once", "1", PHP_INI_ALL, OnUpdateBool, dump_once, zend_xdebug_globals, xdebug_globals) STD_PHP_INI_BOOLEAN("xdebug.dump_undefined", "0", PHP_INI_ALL, OnUpdateBool, dump_undefined, zend_xdebug_globals, xdebug_globals)