Merge branch 'PHP-5.6'

* PHP-5.6:
  fix test filename
This commit is contained in:
Anatol Belski 2014-09-29 20:31:02 +02:00
commit e46187daf5

View File

@ -2,7 +2,7 @@
Bug #51800 proc_open on Windows hangs forever, the right way to do it with more data Bug #51800 proc_open on Windows hangs forever, the right way to do it with more data
--FILE-- --FILE--
<?php <?php
$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right.php"; $callee = dirname(__FILE__) . "/process_proc_open_bug51800_right2.php";
$php = PHP_BINARY; $php = PHP_BINARY;
$cmd = "$php $callee"; $cmd = "$php $callee";
@ -66,7 +66,7 @@ var_dump(array(
===DONE=== ===DONE===
--CLEAN-- --CLEAN--
<?php <?php
$callee = dirname(__FILE__) . "/process_proc_open_bug51800_right.php"; $callee = dirname(__FILE__) . "/process_proc_open_bug51800_right2.php";
unlink($callee); unlink($callee);
?> ?>
--EXPECTF-- --EXPECTF--