cvs: php4(PHP_4_0_7) /tests/basic 002.phpt 003.phpt 004.phpt 005.phpt 011.phpt

sniper Tue Nov 13 07:21:03 2001 EDT Modified files: (Branch: PHP_4_0_7) /php4/tests/basic 002.phpt 003.phpt 004.phpt 005.phpt 011.phpt Log: MFH Index: php4/tests/basic/002.phpt diff -u php4/tests/basic/002.phpt:1.1 php4/tests/basic/002.phpt:1.1.8.1 --- php4/tests/basic/002.phpt:1.1 Sun Aug 27 15:46:04 2000 +++ php4/tests/basic/002.phpt Tue Nov 13 07:21:03 2001 @@ -5,6 +5,6 @@ --GET-- --FILE-- <?php error_reporting(0); -echo $a?> +echo $_POST['a']; ?> --EXPECT-- Hello World Index: php4/tests/basic/003.phpt diff -u php4/tests/basic/003.phpt:1.1 php4/tests/basic/003.phpt:1.1.8.1 --- php4/tests/basic/003.phpt:1.1 Sun Aug 27 15:46:04 2000 +++ php4/tests/basic/003.phpt Tue Nov 13 07:21:03 2001 @@ -7,6 +7,6 @@ --FILE-- <?php error_reporting(0); -echo "$a $b $c"?> +echo "{$_POST['a']} {$_GET['b']} {$_GET['c']}"?> --EXPECT-- Hello World Hello Again World Hi Mom Index: php4/tests/basic/004.phpt diff -u php4/tests/basic/004.phpt:1.1 php4/tests/basic/004.phpt:1.1.8.1 --- php4/tests/basic/004.phpt:1.1 Sun Aug 27 15:46:04 2000 +++ php4/tests/basic/004.phpt Tue Nov 13 07:21:03 2001 @@ -6,6 +6,6 @@ --FILE-- <?php error_reporting(0); -echo "$a $b"?> +echo "{$_POST['a']} {$_POST['b']}" ?> --EXPECT-- Hello World Hello Again World Index: php4/tests/basic/005.phpt diff -u php4/tests/basic/005.phpt:1.1 php4/tests/basic/005.phpt:1.1.8.1 --- php4/tests/basic/005.phpt:1.1 Sun Aug 27 15:46:04 2000 +++ php4/tests/basic/005.phpt Tue Nov 13 07:21:03 2001 @@ -6,6 +6,6 @@ --FILE-- <?php error_reporting(0); -echo "$a $b $c"?> +echo "{$_POST['a']} {$_POST['b']} {$_POST['c']}"?> --EXPECT-- Hello World Hello Again World 1 Index: php4/tests/basic/011.phpt diff -u php4/tests/basic/011.phpt:1.1 php4/tests/basic/011.phpt:1.1.8.1 --- php4/tests/basic/011.phpt:1.1 Sun Aug 27 15:46:04 2000 +++ php4/tests/basic/011.phpt Tue Nov 13 07:21:03 2001 @@ -1,12 +1,20 @@ --TEST-- Testing $argc and $argv handling +--SKIPIF-- +<?php if(ini_get('register_argc_argv') == '') echo 'skip'; ?> --POST-- --GET-- ab+cd+ef+123+test --FILE-- <?php - for($i=0;$i<$argc;$i++) { - echo "$i: ".$argv[$i]."\n"; + if(ini_get('register_globals') != '') { + for($i=0;$i<$argc;$i++) { + echo "$i: ".$argv[$i]."\n"; + } + } else { + for($i=0;$i<$_SERVER['argc'];$i++) { + echo "$i: ".$_SERVER['argv'][$i]."\n"; + } } ?> --EXPECT--