[Process] Add more precision to Process::stop timeout

symfony · Aug 13, 2013 · fa769a2 · fa769a2
1 parent 57d4159
commit fa769a2
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -631,12 +631,10 @@ public function getStatus()
      */
     public function stop($timeout = 10)
     {
-        $timeoutMicro = (int) $timeout*1E6;
+        $timeoutMicro = microtime(true) + $timeout;
         if ($this->isRunning()) {
             proc_terminate($this->process);
-            $time = 0;
-            while (1 == $this->isRunning() && $time < $timeoutMicro) {
-                $time += 1000;
+            while ($this->isRunning() && microtime(true) < $timeoutMicro) {
                 usleep(1000);
             }