Merge remote-tracking branch 'l3/MC-38770' into BUGFIX-11-23

Author: dhorytskyi

lib/internal/Magento/Framework/App/Bootstrap.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Autoload\Populator;
 use Magento\Framework\Config\File\ConfigFilePool;
 use Magento\Framework\Filesystem\DriverPool;
+use Magento\Framework\HTTP\PhpEnvironment\Response;
 use Psr\Log\LoggerInterface;
 
 /**
@@ -386,7 +387,7 @@ private function initErrorHandler()
         $handler = new ErrorHandler();
         set_error_handler([$handler, 'handler']);
     }
-    
+
     /**
      * Getter for error code
      *
@@ -428,9 +429,13 @@ public function isDeveloperMode()
      */
     protected function terminate(\Throwable $e)
     {
-
+        /** @var Response $response */
+        $response = $this->objectManager->get(Response::class);
+        $response->clearHeaders();
+        $response->setHttpResponseCode(500);
+        $response->setHeader('Content-Type', 'text/plain');
         if ($this->isDeveloperMode()) {
-            echo $e;
+            $response->setBody($e);
         } else {
             $message = "An error has happened during application run. See exception log for details.\n";
             try {
@@ -441,8 +446,9 @@ protected function terminate(\Throwable $e)
             } catch (\Exception $e) {
                 $message .= "Could not write error message to log. Please use developer mode to see the message.\n";
             }
-            echo $message;
+            $response->setBody($message);
         }
+        $response->sendResponse();
         exit(1);
     }
     // phpcs:enable