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:
commit
328818a5f9
@ -310,8 +310,13 @@ class Process
|
|||||||
}
|
}
|
||||||
$this->updateStatus(false);
|
$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);
|
$exitcode = proc_close($this->process);
|
||||||
|
|
||||||
|
// Windows only : when using file handles, some activity may occur after
|
||||||
|
// calling proc_close
|
||||||
while($this->processPipes->hasOpenHandles()) {
|
while($this->processPipes->hasOpenHandles()) {
|
||||||
usleep(100);
|
usleep(100);
|
||||||
foreach ($this->processPipes->readAndCloseHandles(true) as $type => $data) {
|
foreach ($this->processPipes->readAndCloseHandles(true) as $type => $data) {
|
||||||
|
@ -77,14 +77,24 @@ class ProcessPipes
|
|||||||
*/
|
*/
|
||||||
public function close()
|
public function close()
|
||||||
{
|
{
|
||||||
foreach ($this->pipes as $offset => $pipe) {
|
$this->closeUnixPipes();
|
||||||
fclose($pipe);
|
|
||||||
}
|
|
||||||
|
|
||||||
foreach ($this->fileHandles as $offset => $handle) {
|
foreach ($this->fileHandles as $offset => $handle) {
|
||||||
fclose($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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Reference in New Issue
Block a user