Merge branch 'di-config' into tmp-path

Conflicts:
	tests/PHPUnit/Integration/LogTest.php

1 files changed, 8 insertions, 0 deletions

diff --git a/core/CliMulti.php b/core/CliMulti.php
index aee8d7e35d..8a1bffd773 100644
--- a/core/CliMulti.php
+++ b/core/CliMulti.php
@@ -152,6 +152,14 @@ class CliMulti {
                 return false;
             }
 
+            $pid = $process->getPid();
+            foreach ($this->outputs as $output) {
+                if ($output->getOutputId() === $pid && $output->isAbnormal()) {
+                    $process->finishProcess();
+                    return true;
+                }
+            }
+
             if ($process->hasFinished()) {
                 // prevent from checking this process over and over again
                 unset($this->processes[$index]);