bug #16510 [2.3][Process] fix Proccess run with pts enabled (ewgRa)

nicolas-grekas · nicolas-grekas · commit ab3c8f891a26 · 2015-11-10T11:50:50.000+01:00
This PR was squashed before being merged into the 2.3 branch (closes #16510). Discussion ---------- [2.3][Process] fix Proccess run with pts enabled | Q | A | ------------- | --- | Bug fix? | yes | New feature? | no | BC breaks? | no | Deprecations? | no | Tests pass? | yes | Fixed tickets | #12643 | License | MIT | Doc PR | Commits ------- 9cf90fb [2.3][Process] fix Proccess run with pts enabled
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -237,8 +237,20 @@ public function start($callback = null)
             }
         }
 
+        $ptsWorkaround = null;
+
+        if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {
+            // Workaround for the bug, when PTS functionality is enabled.
+            // @see : https://bugs.php.net/69442
+            $ptsWorkaround = fopen('php://fd/0', 'r');
+        }
+
         $this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);
 
+        if ($ptsWorkaround) {
+            fclose($ptsWorkaround);
+        }
+
         if (!is_resource($this->process)) {
             throw new RuntimeException('Unable to launch a new process.');
         }

Original file line number	Diff line number	Diff line change
`@@ -237,8 +237,20 @@ public function start($callback = null)`
`237`	`237`	`}`
`238`	`238`	`}`
`239`	`239`
	`240`	`+ $ptsWorkaround = null;`
	`241`	`+`
	`242`	`+ if (!$this->useFileHandles && $this->enhanceSigchildCompatibility && $this->isSigchildEnabled()) {`
	`243`	`+ // Workaround for the bug, when PTS functionality is enabled.`
	`244`	`+ // @see : https://bugs.php.net/69442`
	`245`	`+ $ptsWorkaround = fopen('php://fd/0', 'r');`
	`246`	`+ }`
	`247`	`+`
`240`	`248`	`$this->process = proc_open($commandline, $descriptors, $this->processPipes->pipes, $this->cwd, $this->env, $this->options);`
`241`	`249`
	`250`	`+ if ($ptsWorkaround) {`
	`251`	`+ fclose($ptsWorkaround);`
	`252`	`+ }`
	`253`	`+`
`242`	`254`	`if (!is_resource($this->process)) {`
`243`	`255`	`throw new RuntimeException('Unable to launch a new process.');`
`244`	`256`	`}`