stas Mon, 01 Aug 2011 01:00:57 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=314004
Log:
fix failing tests
Changed paths:
U
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_loadHTML_error1.phpt
U
php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
U php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt
U php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_error.phpt
U php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt
U php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt
U php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug43301.phpt
U php/php-src/branches/PHP_5_4/ext/mcrypt/tests/blowfish.phpt
U php/php-src/branches/PHP_5_4/tests/basic/028.phpt
U php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt
U php/php-src/trunk/ext/dom/tests/DOMDocument_loadHTML_error1.phpt
U php/php-src/trunk/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
U php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt
U php/php-src/trunk/ext/fileinfo/tests/finfo_open_error.phpt
U php/php-src/trunk/ext/iconv/tests/bug52941.phpt
U php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt
U php/php-src/trunk/ext/mbstring/tests/bug43301.phpt
U php/php-src/trunk/ext/mcrypt/tests/blowfish.phpt
U php/php-src/trunk/tests/basic/028.phpt
U php/php-src/trunk/tests/basic/bug46313-win.phpt
Modified: php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_loadHTML_error1.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_loadHTML_error1.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_loadHTML_error1.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -12,4 +12,4 @@
$doc->loadHTML();
?>
--EXPECTF--
-Warning: DOMDocument::loadHTML() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: DOMDocument::loadHTML() expects at least 1 parameter, 0 given in %s on line %d
Modified: php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -23,3 +23,9 @@
?>
--EXPECTF--
+Warning: DOMDocument::relaxNGValidate(): I/O warning : failed to load external entity "%s/foo.rng" in %s on line %d
+
+Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load %s/foo.rng in %s on line %d
+
+Warning: DOMDocument::relaxNGValidate(): Invalid RelaxNG in %s on line %d
+bool(false)
Modified: php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_001.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -18,6 +18,24 @@
bool(false)
resource(%d) of type (file_info)
resource(%d) of type (file_info)
+
+Warning: finfo_open(%s/123): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(%s/123): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%s/123'. in %s on line %d
bool(false)
+
+Warning: finfo_open(%s/1): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(%s/1): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%s/1'. in %s on line %d
bool(false)
+
+Warning: finfo_open(/foo/bar/inexistent): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(/foo/bar/inexistent): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '/foo/bar/inexistent'. in %s on line %d
bool(false)
Modified: php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_error.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_error.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/fileinfo/tests/finfo_open_error.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -26,6 +26,12 @@
===DONE===
--EXPECTF--
*** Testing finfo_open() : error functionality ***
+
+Warning: finfo_open(%s/foobarfile): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(%s/foobarfile): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%s/foobarfile'. in %s on line %d
bool(false)
Warning: finfo_open() expects parameter 1 to be long, array given in %s on line %d
@@ -37,10 +43,10 @@
Notice: finfo_open(): Warning: using regular magic file `%s' in %s on line %d
resource(%d) of type (file_info)
-Warning: finfo_open() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
+Warning: finfo_open() expects parameter 1 to be long, string given in %s on line %d
bool(false)
-Warning: finfo::finfo() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
+Warning: finfo::finfo() expects parameter 1 to be long, string given in %s on line %d
object(finfo)#%d (%d) {
}
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/iconv/tests/bug52941.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -32,10 +32,10 @@
string(17) "<[email protected]>"
string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(32) "=?ks_c_5601-1987?B?UkU6odk=?=Foo"
+string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
string(18) "<[email protected]>"
string(17) "<[email protected]>"
string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(32) "=?ks_c_5601-1987?B?UkU6odk=?=Foo"
+string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
string(18) "<[email protected]>"
Modified: php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/iconv/tests/iconv_stream_filter.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -34,6 +34,8 @@
string(20) "a4b3a4f3a4cba4c1a4cf"
string(10) "69636f6e76"
string(2) "0a"
+
+Warning: fread(): iconv stream filter ("ISO-2022-JP"=>"EUC-JP"): invalid multibyte sequence in %s on line %d
bool(true)
bool(true)
bool(true)
Modified: php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug43301.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug43301.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/mbstring/tests/bug43301.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -15,7 +15,7 @@
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %sbug43301.php(%d) : mbregex replace on line 1
+Parse error: syntax error, unexpected '1' (T_LNUMBER), expecting variable (T_VARIABLE) or '$' in %sbug43301.php(%d) : mbregex replace on line %d
Fatal error: mb_ereg_replace(): Failed evaluating code:
$1 in %sbug43301.php on line %d
Modified: php/php-src/branches/PHP_5_4/ext/mcrypt/tests/blowfish.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/mcrypt/tests/blowfish.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/ext/mcrypt/tests/blowfish.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -4,10 +4,12 @@
<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
--FILE--
<?php
-function hex2bin($data) {
- $len = strlen($data);
- return pack("H" . $len, $data);
-}
+if(!function_exists("hex2bin")) {
+ function hex2bin($data) {
+ $len = strlen($data);
+ return pack("H" . $len, $data);
+ }
+}
print "key plain crypt guess stat\n";
$null = "\0\0\0\0\0\0\0\0";
Modified: php/php-src/branches/PHP_5_4/tests/basic/028.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/basic/028.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/tests/basic/028.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -69,7 +69,7 @@
<?php
var_dump($_POST);
?>
---EXPECTF--
+--EXPECT--
array(15) {
["name1"]=>
string(8) "testname"
@@ -77,28 +77,28 @@
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"
}
Modified: php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/branches/PHP_5_4/tests/basic/bug46313-win.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -3,9 +3,7 @@
--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 @@
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)
-
Modified: php/php-src/trunk/ext/dom/tests/DOMDocument_loadHTML_error1.phpt
===================================================================
--- php/php-src/trunk/ext/dom/tests/DOMDocument_loadHTML_error1.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/dom/tests/DOMDocument_loadHTML_error1.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -12,4 +12,4 @@
$doc->loadHTML();
?>
--EXPECTF--
-Warning: DOMDocument::loadHTML() expects exactly 1 parameter, 0 given in %s on line %d
+Warning: DOMDocument::loadHTML() expects at least 1 parameter, 0 given in %s on line %d
Modified: php/php-src/trunk/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt
===================================================================
--- php/php-src/trunk/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/dom/tests/DOMDocument_relaxNGValidate_error2.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -23,3 +23,9 @@
?>
--EXPECTF--
+Warning: DOMDocument::relaxNGValidate(): I/O warning : failed to load external entity "%s/foo.rng" in %s on line %d
+
+Warning: DOMDocument::relaxNGValidate(): xmlRelaxNGParse: could not load %s/foo.rng in %s on line %d
+
+Warning: DOMDocument::relaxNGValidate(): Invalid RelaxNG in %s on line %d
+bool(false)
Modified: php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt
===================================================================
--- php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/fileinfo/tests/finfo_open_001.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -18,6 +18,24 @@
bool(false)
resource(%d) of type (file_info)
resource(%d) of type (file_info)
+
+Warning: finfo_open(%s/123): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(%s/123): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%s/123'. in %s on line %d
bool(false)
+
+Warning: finfo_open(%s/1): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(%s/1): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%s/1'. in %s on line %d
bool(false)
+
+Warning: finfo_open(/foo/bar/inexistent): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(/foo/bar/inexistent): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '/foo/bar/inexistent'. in %s on line %d
bool(false)
Modified: php/php-src/trunk/ext/fileinfo/tests/finfo_open_error.phpt
===================================================================
--- php/php-src/trunk/ext/fileinfo/tests/finfo_open_error.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/fileinfo/tests/finfo_open_error.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -26,6 +26,12 @@
===DONE===
--EXPECTF--
*** Testing finfo_open() : error functionality ***
+
+Warning: finfo_open(%s/foobarfile): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(%s/foobarfile): failed to open stream: No such file or directory in %s on line %d
+
+Warning: finfo_open(): Failed to load magic database at '%s/foobarfile'. in %s on line %d
bool(false)
Warning: finfo_open() expects parameter 1 to be long, array given in %s on line %d
@@ -37,10 +43,10 @@
Notice: finfo_open(): Warning: using regular magic file `%s' in %s on line %d
resource(%d) of type (file_info)
-Warning: finfo_open() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
+Warning: finfo_open() expects parameter 1 to be long, string given in %s on line %d
bool(false)
-Warning: finfo::finfo() expects parameter 1 to be long, %unicode_string_optional% given in %s on line %d
+Warning: finfo::finfo() expects parameter 1 to be long, string given in %s on line %d
object(finfo)#%d (%d) {
}
===DONE===
Modified: php/php-src/trunk/ext/iconv/tests/bug52941.phpt
===================================================================
--- php/php-src/trunk/ext/iconv/tests/bug52941.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/iconv/tests/bug52941.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -32,10 +32,10 @@
string(17) "<[email protected]>"
string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(32) "=?ks_c_5601-1987?B?UkU6odk=?=Foo"
+string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
string(18) "<[email protected]>"
string(17) "<[email protected]>"
string(29) "=?ks_c_5601-1987?B?UkU6odk=?="
string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
-string(32) "=?ks_c_5601-1987?B?UkU6odk=?=Foo"
+string(33) "=?ks_c_5601-1987?B?UkU6odk=?= Foo"
string(18) "<[email protected]>"
Modified: php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt
===================================================================
--- php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/iconv/tests/iconv_stream_filter.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -34,6 +34,8 @@
string(20) "a4b3a4f3a4cba4c1a4cf"
string(10) "69636f6e76"
string(2) "0a"
+
+Warning: fread(): iconv stream filter ("ISO-2022-JP"=>"EUC-JP"): invalid multibyte sequence in %s on line %d
bool(true)
bool(true)
bool(true)
Modified: php/php-src/trunk/ext/mbstring/tests/bug43301.phpt
===================================================================
--- php/php-src/trunk/ext/mbstring/tests/bug43301.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/mbstring/tests/bug43301.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -15,7 +15,7 @@
?>
--EXPECTF--
-Parse error: syntax error, unexpected T_LNUMBER, expecting T_VARIABLE or '$' in %sbug43301.php(%d) : mbregex replace on line 1
+Parse error: syntax error, unexpected '1' (T_LNUMBER), expecting variable (T_VARIABLE) or '$' in %sbug43301.php(%d) : mbregex replace on line %d
Fatal error: mb_ereg_replace(): Failed evaluating code:
$1 in %sbug43301.php on line %d
Modified: php/php-src/trunk/ext/mcrypt/tests/blowfish.phpt
===================================================================
--- php/php-src/trunk/ext/mcrypt/tests/blowfish.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/ext/mcrypt/tests/blowfish.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -4,10 +4,12 @@
<?php if (!extension_loaded("mcrypt")) print "skip"; ?>
--FILE--
<?php
-function hex2bin($data) {
- $len = strlen($data);
- return pack("H" . $len, $data);
-}
+if(!function_exists("hex2bin")) {
+ function hex2bin($data) {
+ $len = strlen($data);
+ return pack("H" . $len, $data);
+ }
+}
print "key plain crypt guess stat\n";
$null = "\0\0\0\0\0\0\0\0";
Modified: php/php-src/trunk/tests/basic/028.phpt
===================================================================
--- php/php-src/trunk/tests/basic/028.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/tests/basic/028.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -69,7 +69,7 @@
<?php
var_dump($_POST);
?>
---EXPECTF--
+--EXPECT--
array(15) {
["name1"]=>
string(8) "testname"
@@ -77,28 +77,28 @@
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"
}
Modified: php/php-src/trunk/tests/basic/bug46313-win.phpt
===================================================================
--- php/php-src/trunk/tests/basic/bug46313-win.phpt 2011-07-31 23:14:04 UTC (rev 314003)
+++ php/php-src/trunk/tests/basic/bug46313-win.phpt 2011-08-01 01:00:57 UTC (rev 314004)
@@ -3,9 +3,7 @@
--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 @@
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)
-
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
