This commit is contained in:
Nuno Lopes 2006-09-14 17:07:41 +00:00
parent 367d65eced
commit 3ed3a71741
2 changed files with 22 additions and 2 deletions

View File

@ -841,7 +841,7 @@ function error_report($testname, $logname, $tested)
}
}
function system_with_timeout($commandline, $env = null)
function system_with_timeout($commandline, $env = null, $stdin = null)
{
global $leak_check;
@ -856,6 +856,9 @@ function system_with_timeout($commandline, $env = null)
if (!$proc)
return false;
if (is_string($stdin)) {
fwrite($pipes[0], $stdin);
}
fclose($pipes[0]);
while (true) {
@ -1400,7 +1403,7 @@ SCRIPT_FILENAME = " . $env['SCRIPT_FILENAME'] . "
COMMAND $cmd
";
$out = system_with_timeout($cmd, $env);
$out = system_with_timeout($cmd, $env, isset($section_text['STDIN']) ? $section_text['STDIN'] : null);
if (array_key_exists('CLEAN', $section_text) && (!$no_clean || $cfg['keep']['clean'])) {
if (trim($section_text['CLEAN'])) {

View File

@ -0,0 +1,17 @@
--TEST--
STDIN input
--FILE--
<?php
var_dump(stream_get_contents(STDIN));
var_dump(stream_get_contents(fopen('php://stdin', 'r')));
var_dump(file_get_contents('php://stdin'));
?>
--STDIN--
fooBar
use this to input some thing to the php script
--EXPECT--
string(54) "fooBar
use this to input some thing to the php script
"
string(0) ""
string(0) ""