Merge branch '2.2' into main

2022-01-05 16:52:18 +01:00 · 2022-01-05 16:52:18 +01:00 · 7d1aa65239
parent 3a27cb2e91 cb41ad1d4b
commit 7d1aa65239
1 changed files with 2 additions and 0 deletions
--- a/src/Composer/Util/ProcessExecutor.php
+++ b/src/Composer/Util/ProcessExecutor.php
@ -279,6 +279,8 @@ class ProcessExecutor
                if (!$job['process']->isRunning()) {
                    call_user_func($job['resolve'], $job['process']);
                }
+
+                $job['process']->checkTimeout();
            }

            if ($this->runningJobs < $this->maxJobs) {