jani Tue Apr 8 08:45:04 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/zlib/tests bug_40189.phpt bug_40189_2.phpt
zlib_filter_inflate2.phpt
Log:
MF53: Fix tests
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/bug_40189.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/zlib/tests/bug_40189.phpt
diff -u php-src/ext/zlib/tests/bug_40189.phpt:1.1.4.2
php-src/ext/zlib/tests/bug_40189.phpt:1.1.4.3
--- php-src/ext/zlib/tests/bug_40189.phpt:1.1.4.2 Sat Jan 12 21:35:44 2008
+++ php-src/ext/zlib/tests/bug_40189.phpt Tue Apr 8 08:45:04 2008
@@ -7,13 +7,17 @@
// this string is an excerpt of a phar archive that caused an infinite loop
$a =
"\x3\x0\x85\x46\x2f\x7c\xc2\xaa\x69\x2b\x6d\xe5\xdb\xfe\xe4\x21\x8f\x0\x97\x21\x1d\x2\x0\x0\x0\x47\x42\x4d\x42";
var_dump(base64_encode($a));
-$gp = fopen('test.other', 'wb');
+$gp = fopen(dirname(__FILE__) . '/test.other', 'wb');
$fp =
fopen('data://text/plain;base64,AwCFRi98wqppK23l2/7kIY8AlyEdAgAAAEdCTUI=', 'r');
stream_filter_append($fp, 'zlib.inflate', STREAM_FILTER_READ);
var_dump(stream_copy_to_stream($fp, $gp, 5));
fclose($fp);
fclose($gp);
-var_dump(file_get_contents('test.other'));
+var_dump(file_get_contents(dirname(__FILE__) . '/test.other'));
+?>
+--CLEAN--
+<?php
[EMAIL PROTECTED](dirname(__FILE__) . '/test.other');
?>
--EXPECT--
string(40) "AwCFRi98wqppK23l2/7kIY8AlyEdAgAAAEdCTUI="
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/bug_40189_2.phpt?r1=1.1.4.2&r2=1.1.4.3&diff_format=u
Index: php-src/ext/zlib/tests/bug_40189_2.phpt
diff -u php-src/ext/zlib/tests/bug_40189_2.phpt:1.1.4.2
php-src/ext/zlib/tests/bug_40189_2.phpt:1.1.4.3
--- php-src/ext/zlib/tests/bug_40189_2.phpt:1.1.4.2 Sat Jan 12 21:35:44 2008
+++ php-src/ext/zlib/tests/bug_40189_2.phpt Tue Apr 8 08:45:04 2008
@@ -4,7 +4,7 @@
<?php if (!extension_loaded("zlib")) print "skip"; ?>
--FILE--
<?php
-$a = fopen('ext/zlib/tests/bug.tar', 'rb');
+$a = fopen(dirname(__FILE__). '/bug.tar', 'rb');
stream_filter_append($a, 'zlib.deflate', STREAM_FILTER_READ, array('window' =>
15+16));
$b = fread($a, 4716032);
var_dump(strlen($b));
http://cvs.php.net/viewvc.cgi/php-src/ext/zlib/tests/zlib_filter_inflate2.phpt?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/ext/zlib/tests/zlib_filter_inflate2.phpt
diff -u php-src/ext/zlib/tests/zlib_filter_inflate2.phpt:1.1.2.2
php-src/ext/zlib/tests/zlib_filter_inflate2.phpt:1.1.2.3
--- php-src/ext/zlib/tests/zlib_filter_inflate2.phpt:1.1.2.2 Wed Jan 9
06:45:15 2008
+++ php-src/ext/zlib/tests/zlib_filter_inflate2.phpt Tue Apr 8 08:45:04 2008
@@ -3,7 +3,7 @@
--SKIPIF--
<?php if (!extension_loaded("zlib")) print "skip"; ?>
--FILE--
-<?php /* $Id: zlib_filter_inflate2.phpt,v 1.1.2.2 2008/01/09 06:45:15 cellog
Exp $ */
+<?php /* $Id: zlib_filter_inflate2.phpt,v 1.1.2.3 2008/04/08 08:45:04 jani Exp
$ */
$a = gzopen(dirname(__FILE__) . '/test.txt.gz', 'w');
fwrite($a, "This is quite the thing ain't it\n");
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
