pajoye Mon, 05 Sep 2011 13:31:13 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=316179
Log:
- close the stream before removing the file (win and other system may lock it)
and use test dir for tmp data
Changed paths:
U php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt
U php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt
U php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt
Modified: php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt
===================================================================
--- php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt
2011-09-05 13:23:25 UTC (rev 316178)
+++ php/php-src/branches/PHP_5_3/ext/standard/tests/streams/bug54946.phpt
2011-09-05 13:31:13 UTC (rev 316179)
@@ -2,33 +2,32 @@
Bug#54946 stream_get_contents infinite loop
--FILE--
<?php
-$filename = tempnam(sys_get_temp_dir(), "phpbug");
-
+$filename = tempnam(__DIR__, "phpbug");
$stream = fopen($filename, "w"); // w or a
$retval = stream_get_contents($stream, 1, 1);
-
+fclose($stream);
var_dump($retval);
unlink($filename);
-$filename = tempnam(sys_get_temp_dir(), "phpbug2");
+$filename = tempnam(__DIR__, "phpbug2");
$stream = fopen($filename, "a");
$retval = stream_get_contents($stream, 1, 1);
-
var_dump($retval);
+fclose($stream);
unlink($filename);
-$filename = tempnam(sys_get_temp_dir(), "phpbug3");
+$filename = tempnam(__DIR__, "phpbug3");
$stream = fopen($filename, "a");
fseek($stream, 1);
$retval = stream_get_contents($stream, 1);
-
var_dump($retval);
+fclose($stream);
unlink($filename);
?>
===DONE===
Modified: php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt
===================================================================
--- php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt
2011-09-05 13:23:25 UTC (rev 316178)
+++ php/php-src/branches/PHP_5_4/ext/standard/tests/streams/bug54946.phpt
2011-09-05 13:31:13 UTC (rev 316179)
@@ -2,33 +2,32 @@
Bug#54946 stream_get_contents infinite loop
--FILE--
<?php
-$filename = tempnam(sys_get_temp_dir(), "phpbug");
-
+$filename = tempnam(__DIR__, "phpbug");
$stream = fopen($filename, "w"); // w or a
$retval = stream_get_contents($stream, 1, 1);
-
+fclose($stream);
var_dump($retval);
unlink($filename);
-$filename = tempnam(sys_get_temp_dir(), "phpbug2");
+$filename = tempnam(__DIR__, "phpbug2");
$stream = fopen($filename, "a");
$retval = stream_get_contents($stream, 1, 1);
-
var_dump($retval);
+fclose($stream);
unlink($filename);
-$filename = tempnam(sys_get_temp_dir(), "phpbug3");
+$filename = tempnam(__DIR__, "phpbug3");
$stream = fopen($filename, "a");
fseek($stream, 1);
$retval = stream_get_contents($stream, 1);
-
var_dump($retval);
+fclose($stream);
unlink($filename);
?>
===DONE===
Modified: php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt
===================================================================
--- php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt 2011-09-05
13:23:25 UTC (rev 316178)
+++ php/php-src/trunk/ext/standard/tests/streams/bug54946.phpt 2011-09-05
13:31:13 UTC (rev 316179)
@@ -2,33 +2,32 @@
Bug#54946 stream_get_contents infinite loop
--FILE--
<?php
-$filename = tempnam(sys_get_temp_dir(), "phpbug");
-
+$filename = tempnam(__DIR__, "phpbug");
$stream = fopen($filename, "w"); // w or a
$retval = stream_get_contents($stream, 1, 1);
-
+fclose($stream);
var_dump($retval);
unlink($filename);
-$filename = tempnam(sys_get_temp_dir(), "phpbug2");
+$filename = tempnam(__DIR__, "phpbug2");
$stream = fopen($filename, "a");
$retval = stream_get_contents($stream, 1, 1);
-
var_dump($retval);
+fclose($stream);
unlink($filename);
-$filename = tempnam(sys_get_temp_dir(), "phpbug3");
+$filename = tempnam(__DIR__, "phpbug3");
$stream = fopen($filename, "a");
fseek($stream, 1);
$retval = stream_get_contents($stream, 1);
-
var_dump($retval);
+fclose($stream);
unlink($filename);
?>
===DONE===
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
