This commit is contained in:
Fabien Potencier
2013-07-01 14:24:43 +02:00
parent f12e5857c6
commit 4aafcf725f
3 changed files with 6 additions and 6 deletions

View File

@@ -259,9 +259,9 @@ class Process
stream_set_blocking($pipe, false);
}
if ($this->tty) {
$this->status = self::STATUS_TERMINATED;
return;
}
@@ -1102,9 +1102,9 @@ class Process
$this->readBytes = array(
self::STDOUT => 0,
);
return array(array('pipe', 'r'), $this->fileHandles[self::STDOUT], array('pipe', 'w'));
}
}
if ($this->tty) {
$descriptors = array(

View File

@@ -42,7 +42,7 @@ class ProcessUtils
//@see https://bugs.php.net/bug.php?id=49446
if (defined('PHP_WINDOWS_VERSION_BUILD')) {
$escapedArgument = '';
foreach(preg_split('/([%"])/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
foreach (preg_split('/([%"])/i', $argument, -1, PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE) as $part) {
if ('"' == $part) {
$escapedArgument .= '\\"';
} elseif ('%' == $part) {

View File

@@ -8,9 +8,9 @@ pcntl_signal(SIGUSR1, function(){echo "Caught SIGUSR1"; exit;});
$n=0;
// ticks require activity to work - sleep(4); does not work
while($n < 400) {
while ($n < 400) {
usleep(10000);
$n++;
}
return;
return;