Merge branch 'backport-ensure-ob-end-flush' into 1.x.x

samsonasik · Jan 17, 2019 · 8be4f0d · 8be4f0d
2 parents ea2bc2b + 1730d84
commit 8be4f0d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/Listener/Mvc.php b/src/Listener/Mvc.php
@@ -73,6 +73,10 @@ public function phpError(Event $e)
             \ini_set('display_errors', '0');
         }
 
+        while (\ob_get_level() > 0) {
+            \ob_end_flush();
+        }
+
         \ob_start([$this, 'phpFatalErrorHandler']);
         \register_shutdown_function([$this, 'execOnShutdown']);
         \set_error_handler([$this, 'phpErrorHandler']);

diff --git a/src/Middleware/Expressive.php b/src/Middleware/Expressive.php
@@ -77,6 +77,10 @@ public function phpError()
             \ini_set('display_errors', '0');
         }
 
+        while (\ob_get_level() > 0) {
+            \ob_end_flush();
+        }
+
         \ob_start([$this, 'phpFatalErrorHandler']);
         \register_shutdown_function([$this, 'execOnShutdown']);
         \set_error_handler([$this, 'phpErrorHandler']);