Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit b7d18f9309b3 · 2015-12-23T12:03:46.000+01:00
* 2.7:
  [Process] Fix the fix for --enable-sigchild php
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -75,14 +75,6 @@ class Process
     private $latestSignal;
 
     private static $sigchild;
-    private static $posixSignals = array(
-         1, // SIGHUP
-         2, // SIGINT
-         3, // SIGQUIT
-         6, // SIGABRT
-        14, // SIGALRM
-        15, // SIGTERM
-    );
 
     /**
      * Exit codes translation table.
@@ -289,14 +281,9 @@ public function start($callback = null)
             // last exit code is output on the fourth pipe and caught to work around --enable-sigchild
             $descriptors[3] = array('pipe', 'w');
 
-            $commandline = '';
-            foreach (self::$posixSignals as $s) {
-                $commandline .= "trap 'echo s$s >&3' $s;";
-            }
-
             // See https://unix.stackexchange.com/questions/71205/background-process-pipe-input
-            $commandline .= '{ ('.$this->commandline.') <&3 3<&- 3>/dev/null & } 3<&0;';
-            $commandline .= 'pid=$!; echo $pid >&3; wait $pid; code=$?; echo x$code >&3; exit $code';
+            $commandline = '{ ('.$this->commandline.') <&3 3<&- 3>/dev/null & } 3<&0;';
+            $commandline .= 'pid=$!; echo $pid >&3; wait $pid; code=$?; echo $code >&3; exit $code';
 
             // Workaround for the bug, when PTS functionality is enabled.
             // @see : https://bugs.php.net/69442
@@ -1353,19 +1340,9 @@ private function readPipes($blocking, $close)
         $callback = $this->callback;
         foreach ($result as $type => $data) {
             if (3 === $type) {
-                foreach (explode("\n", substr($data, 0, -1)) as $data) {
-                    if ('p' === $data[0]) {
-                        $this->fallbackStatus['pid'] = (int) substr($data, 1);
-                    } elseif ('s' === $data[0]) {
-                        $this->fallbackStatus['signaled'] = true;
-                        $this->fallbackStatus['exitcode'] = -1;
-                        $this->fallbackStatus['termsig'] = (int) substr($data, 1);
-                    } elseif ('x' === $data[0]) {
-                        $this->fallbackStatus['running'] = false;
-                        if (!isset($this->fallbackStatus['signaled'])) {
-                            $this->fallbackStatus['exitcode'] = (int) substr($data, 1);
-                        }
-                    }
+                $this->fallbackStatus['running'] = false;
+                if (!isset($this->fallbackStatus['signaled'])) {
+                    $this->fallbackStatus['exitcode'] = (int) $data;
                 }
             } else {
                 $callback($type === self::STDOUT ? self::OUT : self::ERR, $data);
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -791,7 +791,7 @@ public function testRunProcessWithTimeout()
 
         if ('\\' !== DIRECTORY_SEPARATOR) {
             // On Windows, timers are too transient
-            $maxDuration = $timeout + Process::TIMEOUT_PRECISION;
+            $maxDuration = $timeout + 2 * Process::TIMEOUT_PRECISION;
             $this->assertLessThan($maxDuration, $duration);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -791,7 +791,7 @@ public function testRunProcessWithTimeout()`
`791`	`791`
`792`	`792`	`if ('\\' !== DIRECTORY_SEPARATOR) {`
`793`	`793`	`// On Windows, timers are too transient`
`794`		`- $maxDuration = $timeout + Process::TIMEOUT_PRECISION;`
	`794`	`+ $maxDuration = $timeout + 2 * Process::TIMEOUT_PRECISION;`
`795`	`795`	`$this->assertLessThan($maxDuration, $duration);`
`796`	`796`	`}`
`797`	`797`