lbarnaud Fri Apr 24 19:48:41 2009 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard/tests/network bug20134.phpt
/php-src/ext/standard/tests/strings bug40754.phpt
/php-src/ext/standard/tests/url bug47174.phpt
/php-src/ext/standard/tests/versioning php_sapi_name.phpt
/php-src/sapi/cgi/tests 002.phpt 003.phpt 008.phpt 009.phpt
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/network/bug20134.phpt?r1=1.2&r2=1.2.8.1&diff_format=u
Index: php-src/ext/standard/tests/network/bug20134.phpt
diff -u php-src/ext/standard/tests/network/bug20134.phpt:1.2
php-src/ext/standard/tests/network/bug20134.phpt:1.2.8.1
--- php-src/ext/standard/tests/network/bug20134.phpt:1.2 Thu Jan 23
19:07:25 2003
+++ php-src/ext/standard/tests/network/bug20134.phpt Fri Apr 24 19:48:41 2009
@@ -11,7 +11,7 @@
}
else {
/* Likewise, writes will always appear to succeed */
- $x = fwrite($fp,"\n");
+ $x = fwrite($fp,b"\n");
var_dump($x);
/* But reads should always fail */
$content = fread($fp, 40);
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/strings/bug40754.phpt?r1=1.1.2.3.2.2&r2=1.1.2.3.2.3&diff_format=u
Index: php-src/ext/standard/tests/strings/bug40754.phpt
diff -u php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3.2.2
php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3.2.3
--- php-src/ext/standard/tests/strings/bug40754.phpt:1.1.2.3.2.2 Sun Feb
15 07:10:29 2009
+++ php-src/ext/standard/tests/strings/bug40754.phpt Fri Apr 24 19:48:41 2009
@@ -27,8 +27,8 @@
?>
--EXPECTF--
-string(4) "bcde"
-string(6) "abcdex"
+%unicode|string%(4) "bcde"
+%unicode|string%(6) "abcdex"
bool(false)
bool(false)
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/url/bug47174.phpt?r1=1.1.2.1&r2=1.1.2.2&diff_format=u
Index: php-src/ext/standard/tests/url/bug47174.phpt
diff -u php-src/ext/standard/tests/url/bug47174.phpt:1.1.2.1
php-src/ext/standard/tests/url/bug47174.phpt:1.1.2.2
--- php-src/ext/standard/tests/url/bug47174.phpt:1.1.2.1 Sun Jan 25
18:27:12 2009
+++ php-src/ext/standard/tests/url/bug47174.phpt Fri Apr 24 19:48:41 2009
@@ -2,13 +2,13 @@
Bug #47174 (base64_decode() interprets pad char in mid string as terminator)
--FILE--
<?php
-if (base64_decode("dGVzdA==") == base64_decode("dGVzdA==CRAP")) {
+if (base64_decode(b"dGVzdA==") == base64_decode(b"dGVzdA==CRAP")) {
echo "Same octect data - Signature Valid\n";
} else {
echo "Invalid Signature\n";
}
-$in = base64_encode("foo") . '==' . base64_encode("bar");
+$in = base64_encode(b"foo") . b'==' . base64_encode(b"bar");
var_dump($in, base64_decode($in));
?>
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/tests/versioning/php_sapi_name.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/standard/tests/versioning/php_sapi_name.phpt
diff -u php-src/ext/standard/tests/versioning/php_sapi_name.phpt:1.1.4.2
php-src/ext/standard/tests/versioning/php_sapi_name.phpt:1.1.4.3
--- php-src/ext/standard/tests/versioning/php_sapi_name.phpt:1.1.4.2 Thu Apr
9 13:29:01 2009
+++ php-src/ext/standard/tests/versioning/php_sapi_name.phpt Fri Apr 24
19:48:41 2009
@@ -6,4 +6,4 @@
var_dump(php_sapi_name());
--EXPECTF--
-string(3) "c%ci"
+%unicode|string%(3) "c%ci"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/002.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/sapi/cgi/tests/002.phpt
diff -u php-src/sapi/cgi/tests/002.phpt:1.1.2.2
php-src/sapi/cgi/tests/002.phpt:1.1.2.2.2.1
--- php-src/sapi/cgi/tests/002.phpt:1.1.2.2 Tue Apr 17 19:49:26 2007
+++ php-src/sapi/cgi/tests/002.phpt Fri Apr 24 19:48:41 2009
@@ -29,24 +29,24 @@
?>
--EXPECTF--
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "111"
+%unicode|string%(3) "111"
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "500"
+%unicode|string%(3) "500"
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "555"
+%unicode|string%(3) "555"
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
-string(3) "555"
-string(10) "/test/path"
+%unicode|string%(3) "555"
+%unicode|string%(10) "/test/path"
"
Done
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/003.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/sapi/cgi/tests/003.phpt
diff -u php-src/sapi/cgi/tests/003.phpt:1.1.2.2.2.1
php-src/sapi/cgi/tests/003.phpt:1.1.2.2.2.2
--- php-src/sapi/cgi/tests/003.phpt:1.1.2.2.2.1 Thu Nov 1 12:55:42 2007
+++ php-src/sapi/cgi/tests/003.phpt Fri Apr 24 19:48:41 2009
@@ -42,7 +42,7 @@
?>
--EXPECTF--
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
<?php
@@ -50,12 +50,12 @@
"
string(%d) "Status: 404 Not Found
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
No input file specified.
"
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
<?php class test { function foo() {} } ?>
"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/008.phpt?r1=1.1.2.2.2.1&r2=1.1.2.2.2.2&diff_format=u
Index: php-src/sapi/cgi/tests/008.phpt
diff -u php-src/sapi/cgi/tests/008.phpt:1.1.2.2.2.1
php-src/sapi/cgi/tests/008.phpt:1.1.2.2.2.2
--- php-src/sapi/cgi/tests/008.phpt:1.1.2.2.2.1 Thu Nov 1 12:55:42 2007
+++ php-src/sapi/cgi/tests/008.phpt Fri Apr 24 19:48:41 2009
@@ -39,7 +39,7 @@
?>
--EXPECTF--
string(%d) "X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
<code><span style="color: #000000">
<br /><span style="color: #0000BB"><?php<br />$test </span><span
style="color: #007700">= </span><span style="color:
#DD0000">"var"</span><span style="color: #007700">; </span><span
style="color: #FF8000">//var<br />/* test class */<br
/></span><span style="color: #007700">class </span><span style="color:
#0000BB">test </span><span style="color: #007700">{<br
/> private </span><span style="color:
#0000BB">$var </span><span style="color: #007700">= array();<br /><br
/> public static function </span><span
style="color: #0000BB">foo</span><span style="color: #007700">(</span><span
style="color: #0000BB">Test $arg</span><span style="color:
#007700">) {<br
/> echo </span><span
style="color: #DD0000">"hello"</span><span style="color: #007700">;<br
/> </spa!
n><span style="color: #0000BB">var_dump</span><span style="color:
#007700">(</span><span style="color: #0000BB">$this</span><span style="color:
#007700">);<br /> }<br />}<br /><br /></span><span
style="color: #0000BB">$o </span><span style="color:
#007700">= new </span><span style="color: #0000BB">test</span><span
style="color: #007700">;<br /></span><span style="color: #0000BB">?><br
/></span>
@@ -47,7 +47,7 @@
</code>"
string(%d) "Status: 404 Not Found
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
No input file specified.
"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/tests/009.phpt?r1=1.1.2.2&r2=1.1.2.2.2.1&diff_format=u
Index: php-src/sapi/cgi/tests/009.phpt
diff -u php-src/sapi/cgi/tests/009.phpt:1.1.2.2
php-src/sapi/cgi/tests/009.phpt:1.1.2.2.2.1
--- php-src/sapi/cgi/tests/009.phpt:1.1.2.2 Sun Jun 3 22:50:19 2007
+++ php-src/sapi/cgi/tests/009.phpt Fri Apr 24 19:48:41 2009
@@ -24,7 +24,7 @@
?>
--EXPECTF--
X-Powered-By: PHP/%s
-Content-type: text/html
+Content-type: text/html%r; charset=.*|%r
string(%d) "%s/x"
Done
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
