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

see http://php.net/manual/en/function.proc-close.php
This commit is contained in:
Romain Neutron 2013-09-11 21:09:08 +02:00
parent 6ec2cbaa6c
commit 37102dcc7c
2 changed files with 20 additions and 5 deletions

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) {

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();
}
/**