From f1da3ef5e85fff51ba1013ea7906cefb678d64ec Mon Sep 17 00:00:00 2001 From: Bernd Bestel Date: Mon, 12 Jul 2021 17:08:59 +0200 Subject: [PATCH] Optimized clean response handling --- app.php | 2 ++ controllers/CalendarApiController.php | 1 - controllers/FilesApiController.php | 2 -- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app.php b/app.php index 15d64d6b..17ba6a99 100644 --- a/app.php +++ b/app.php @@ -101,4 +101,6 @@ $errorMiddleware->setDefaultErrorHandler( ); $app->add(new CorsMiddleware($app->getResponseFactory())); + +ob_clean(); // No response output before here $app->run(); diff --git a/controllers/CalendarApiController.php b/controllers/CalendarApiController.php index 7cf3d7e2..8d3db47e 100644 --- a/controllers/CalendarApiController.php +++ b/controllers/CalendarApiController.php @@ -49,7 +49,6 @@ class CalendarApiController extends BaseApiController $vCalendar->addEvent($vEvent); } - ob_clean(); // Make sure to ONLY return the file $response->write((new CalendarFactory())->createCalendar($vCalendar)); $response = $response->withHeader('Content-Type', 'text/calendar; charset=utf-8'); return $response->withHeader('Content-Disposition', 'attachment; filename="grocy.ics"'); diff --git a/controllers/FilesApiController.php b/controllers/FilesApiController.php index 4ff4980c..5dbca1ec 100644 --- a/controllers/FilesApiController.php +++ b/controllers/FilesApiController.php @@ -49,7 +49,6 @@ class FilesApiController extends BaseApiController if (file_exists($filePath)) { - ob_clean(); // Make sure to ONLY return the file $response->write(file_get_contents($filePath)); $response = $response->withHeader('Cache-Control', 'max-age=2592000'); $response = $response->withHeader('Content-Type', mime_content_type($filePath)); @@ -81,7 +80,6 @@ class FilesApiController extends BaseApiController if (file_exists($filePath)) { - ob_clean(); // Make sure to ONLY return the file $response->write(file_get_contents($filePath)); $response = $response->withHeader('Cache-Control', 'max-age=2592000'); $response = $response->withHeader('Content-Type', mime_content_type($filePath));