diff options
| author | Stanislav Malyshev <stas@php.net> | 2011-08-01 01:00:57 +0000 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2011-08-01 01:00:57 +0000 |
| commit | 553a08c4e11d16447f826aaa5eb861cb147f3c9b (patch) | |
| tree | 0fca72a3c5a07303af0bb0c58369c5c237e0aeac /tests | |
| parent | b56c6b24ffc72e2d733d87d4ae08051951e4f10d (diff) | |
| download | php-git-553a08c4e11d16447f826aaa5eb861cb147f3c9b.tar.gz | |
fix failing tests
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/basic/028.phpt | 26 | ||||
| -rw-r--r-- | tests/basic/bug46313-win.phpt | 65 |
2 files changed, 13 insertions, 78 deletions
diff --git a/tests/basic/028.phpt b/tests/basic/028.phpt index 6bdcd575ca..cadb25d8d3 100644 --- a/tests/basic/028.phpt +++ b/tests/basic/028.phpt @@ -69,7 +69,7 @@ testname <?php var_dump($_POST); ?> ---EXPECTF-- +--EXPECT-- array(15) { ["name1"]=> string(8) "testname" @@ -77,28 +77,28 @@ array(15) { string(8) "testname" ["name3"]=> string(8) "testname" - ["name\\4"]=> + ["name\4"]=> string(8) "testname" - ["name\\5"]=> + ["name\5"]=> string(8) "testname" - ["name\\\'6"]=> + ["name\'6"]=> string(8) "testname" - ["name\\\"7"]=> + ["name\"7"]=> string(8) "testname" - ["name\\8"]=> + ["name\8"]=> string(8) "testname" - ["name\\9"]=> + ["name\9"]=> string(8) "testname" - ["name\'10"]=> + ["name'10"]=> string(8) "testname" - ["name\\\"11"]=> + ["name\"11"]=> string(8) "testname" - ["name\\12"]=> + ["name\12"]=> string(8) "testname" - ["name\\13"]=> + ["name\13"]=> string(8) "testname" - ["name\\\'14"]=> + ["name\'14"]=> string(8) "testname" - ["name\"15"]=> + ["name"15"]=> string(8) "testname" } diff --git a/tests/basic/bug46313-win.phpt b/tests/basic/bug46313-win.phpt index e588bec767..63da7bb67e 100644 --- a/tests/basic/bug46313-win.phpt +++ b/tests/basic/bug46313-win.phpt @@ -3,9 +3,7 @@ Bug #46313 (Magic quotes broke $_FILES) --SKIPIF-- <?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows-only test"); ?> --INI-- -magic_quotes_gpc=1 file_uploads=1 -register_globals=1 --POST_RAW-- Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 -----------------------------20896060251896012921717172737 @@ -62,66 +60,3 @@ string(%d) "%s" bool(true) Warning: Directive 'register_globals' is deprecated in PHP 5.3 and greater in Unknown on line 0 Warning: Directive 'magic_quotes_gpc' is deprecated in PHP 5.3 and greater in Unknown on line 0 - ---TEST-- -Bug #46313 (Magic quotes broke $_FILES) ---SKIPIF-- -<?php if(substr(PHP_OS, 0, 3) != "WIN") die("skip Windows-only test"); ?> ---INI-- -magic_quotes_gpc=1 -file_uploads=1 ---POST_RAW-- -Content-Type: multipart/form-data; boundary=---------------------------20896060251896012921717172737 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="o1'file"; filename="o1'file.png" -Content-Type: text/plain-file1 - -1 ------------------------------20896060251896012921717172737 -Content-Disposition: form-data; name="o2'file"; filename="o2'file2.txt" -Content-Type: text/plain-file2 - -2 ------------------------------20896060251896012921717172737-- ---FILE-- -<?php -var_dump($_FILES); -var_dump($GLOBALS["o1\'file_name"]); -var_dump($GLOBALS["o1\'file_name"] === $_FILES["o1\'file"]["name"]); -var_dump($GLOBALS["o1\'file"]); -var_dump($GLOBALS["o1\'file"] === $_FILES["o1\'file"]["tmp_name"]); -?> ---EXPECTF-- -array(2) { - ["o1\'file"]=> - array(5) { - ["name"]=> - string(12) "o1" - ["type"]=> - string(16) "text/plain-file1" - ["tmp_name"]=> - string(14) "%s" - ["error"]=> - int(0) - ["size"]=> - int(1) - } - ["o2\'file"]=> - array(5) { - ["name"]=> - string(13) "o2" - ["type"]=> - string(16) "text/plain-file2" - ["tmp_name"]=> - string(14) "%s" - ["error"]=> - int(0) - ["size"]=> - int(1) - } -} -string(12) "o1" -bool(true) -string(%d) "%s" -bool(true) - |