diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed data in pipe being truncated if not read before process termination

Browse Source
This commit is contained in:
Aaron Stephens 2014-01-28 16:56:56 +00:00
parent 2c55a2dafc
commit 7e5191375b
2 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Symfony/Component/Process/ProcessPipes.php
View File

@ -289,9 +289,13 @@ class ProcessPipes
foreach ($r as $pipe) {
$type = array_search($pipe, $this->pipes);
$data = fread($pipe, 8192);
if (strlen($data) > 0) {
$data = '';
while ($dataread = fread($pipe, 8192)) {
$data .= $dataread;
}
if ($data) {
$read[$type] = $data;
}

26
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
View File

@ -80,6 +80,32 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$this->assertLessThan(1.8, $duration);
}
public function testAllOutputIsActuallyReadOnTermination()
{
// this code will result in a maximum of 2 reads of 8192 bytes by calling
// start() and isRunning(). by the time getOutput() is called the process
// has terminated so the internal pipes array is already empty. normally
// the call to start() will not read any data as the process will not have
// generated output, but this is non-deterministic so we must count it as
// a possibility. therefore we need 2 * 8192 plus another byte which will
// never be read.
$expectedOutputSize = 16385;
$code = sprintf('echo str_repeat(\'*\', %d);', $expectedOutputSize);
$p = $this->getProcess(sprintf('php -r %s', escapeshellarg($code)));
$p->start();
usleep(250000);
if ($p->isRunning()) {
$this->fail('Process execution did not complete in the required time frame');
}
$o = $p->getOutput();
$this->assertEquals($expectedOutputSize, strlen($o));
}
public function testCallbacksAreExecutedWithStart()
{
$data = '';