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

merged branch romainneutron/unix-pipes (PR #8996) 

This PR was merged into the 2.2 branch.

Discussion
----------

[Process][2.2] Close unix pipes before calling `proc_close` to avoid a deadlock

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

see http://php.net/manual/en/function.proc-close.php

Commits
-------

37102dc [Process] Close unix pipes before calling `proc_close` to avoid a deadlock
This commit is contained in:
Fabien Potencier 2013-09-12 06:24:58 +02:00
parent 6ec2cbaa6c 37102dcc7c
commit 328818a5f9
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,8 +310,13 @@ class Process
}
$this->updateStatus(false);
// Unix pipes must be closed before calling proc_close to void deadlock
// see manual http://php.net/manual/en/function.proc-close.php
$this->processPipes->closeUnixPipes();
$exitcode = proc_close($this->process);
// Windows only : when using file handles, some activity may occur after
// calling proc_close
while($this->processPipes->hasOpenHandles()) {
usleep(100);
foreach ($this->processPipes->readAndCloseHandles(true) as $type => $data) {

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

@ -77,14 +77,24 @@ class ProcessPipes
*/
public function close()
{
foreach ($this->pipes as $offset => $pipe) {
fclose($pipe);
}
$this->closeUnixPipes();
foreach ($this->fileHandles as $offset => $handle) {
fclose($handle);
}
$this->fileHandles = $this->pipes = array();
$this->fileHandles = array();
}
/**
* Closes unix pipes.
*
* Nothing happens in case file handles are used.
*/
public function closeUnixPipes()
{
foreach ($this->pipes as $pipe) {
fclose($pipe);
}
$this->pipes = array();
}
/**