bug #10153 [Process] Fixed data in pipe being truncated if not read before process termination (astephens25)
This PR was merged into the 2.3 branch.
Discussion
----------
[Process] Fixed data in pipe being truncated if not read before process termination
| Q | A
| ------------- | ---
| Bug fix? | yes
| New feature? | no
| BC breaks? | no
| Deprecations? | no
| Tests pass? | yes
| Fixed tickets | #9409
| License | MIT
| Doc PR | N/A
This is a repeat of the botched pull request #9630.
Commits
-------
7e51913
Fixed data in pipe being truncated if not read before process termination
This commit is contained in:
commit
3d0913464d
@ -289,9 +289,13 @@ class ProcessPipes
|
|||||||
|
|
||||||
foreach ($r as $pipe) {
|
foreach ($r as $pipe) {
|
||||||
$type = array_search($pipe, $this->pipes);
|
$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;
|
$read[$type] = $data;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -80,6 +80,32 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
|
|||||||
$this->assertLessThan(1.8, $duration);
|
$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()
|
public function testCallbacksAreExecutedWithStart()
|
||||||
{
|
{
|
||||||
$data = '';
|
$data = '';
|
||||||
|
Reference in New Issue
Block a user