public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge branch '2.2' into main

pull/10449/head
Jordi Boggiano 2022-01-05 16:52:18 +01:00
parent 3a27cb2e91 cb41ad1d4b
commit 7d1aa65239
No known key found for this signature in database
GPG Key ID: 7BBD42C429EC80BC
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Util/ProcessExecutor.php
View File

@ -279,6 +279,8 @@ class ProcessExecutor
if (!$job['process']->isRunning()) { if (!$job['process']->isRunning()) {
call_user_func($job['resolve'], $job['process']); call_user_func($job['resolve'], $job['process']);
} }
$job['process']->checkTimeout();
} }
if ($this->runningJobs < $this->maxJobs) { if ($this->runningJobs < $this->maxJobs) {