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

merged branch romainneutron/process-merge-2.3 (PR #8990)

Browse Source 
This PR was merged into the 2.3 branch.

Discussion
----------

[Process][2.3] Fix process merge in 2.3

| Q             | A
| ------------- | ---
| Bug fix?      | yes
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| License       | MIT

Handles should be read and closed after `proc_close` is called. (this follows merge of #8983)

Commits
-------

19fef77 [Process] Fix process merge in 2.3
This commit is contained in:
Fabien Potencier 2013-09-11 14:33:06 +02:00
commit c59f52b50b
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/Symfony/Component/Process/Process.php
View File

@ -303,18 +303,6 @@ class Process
}
$this->updateStatus(false);
while ($this->processPipes->hasOpenHandles()) {
usleep(100);
foreach ($this->processPipes->readAndCloseHandles(true) as $type => $data) {
if (3 == $type) {
$this->fallbackExitcode = (int) $data;
} else {
call_user_func($this->callback, $type === self::STDOUT ? self::OUT : self::ERR, $data);
}
}
}
$this->close();
if ($this->processInformation['signaled']) {
if ($this->isSigchildEnabled()) {
throw new RuntimeException('The process has been signaled.');
@ -1062,13 +1050,24 @@ class Process
*/
private function close()
{
$this->processPipes->close();
$exitcode = -1;
if (is_resource($this->process)) {
$exitcode = proc_close($this->process);
}
while ($this->processPipes->hasOpenHandles()) {
usleep(100);
foreach ($this->processPipes->readAndCloseHandles(true) as $type => $data) {
if (3 == $type) {
$this->fallbackExitcode = (int) $data;
} else {
call_user_func($this->callback, $type === self::STDOUT ? self::OUT : self::ERR, $data);
}
}
}
$this->processPipes->close();
$this->exitcode = $this->exitcode !== null ? $this->exitcode : -1;
$this->exitcode = -1 != $exitcode ? $exitcode : $this->exitcode;