Merge branch '2.1' into 2.2
* 2.1:
[Process] Fix regression introduced in #6620 / 880da01c49
, fixes #7082
This commit is contained in:
commit
95a8aa5af2
@ -131,6 +131,10 @@ class Process
|
||||
|
||||
$this->commandline = $commandline;
|
||||
$this->cwd = $cwd;
|
||||
// on windows, if the cwd changed via chdir(), proc_open defaults to the dir where php was started
|
||||
if (null === $this->cwd && defined('PHP_WINDOWS_VERSION_BUILD')) {
|
||||
$this->cwd = getcwd();
|
||||
}
|
||||
if (null !== $env) {
|
||||
$this->env = array();
|
||||
foreach ($env as $key => $value) {
|
||||
|
Reference in New Issue
Block a user