Merge pull request #88 from helhum/fix-content-type-amend

helhum · Nov 22, 2022 · 67d7756 · 67d7756
2 parents c5d3427 + ff74755
commit 67d7756
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/Classes/Middleware/TypoScriptRenderingMiddleware.php b/Classes/Middleware/TypoScriptRenderingMiddleware.php
@@ -73,12 +73,18 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
      */
     private function amendContentType(ResponseInterface $response, string $requestedContentType): ResponseInterface
     {
+        if ($response->getStatusCode() !== 200
+            || !$response->hasHeader('Content-Type')
+        ) {
+            return $response;
+        }
         $originalContentTypeHeader = $response->getHeader('Content-Type')[0];
-        if (strpos($originalContentTypeHeader, self::defaultContentType) === 0 && strpos($originalContentTypeHeader, $requestedContentType) === false) {
-            $response = $response->withHeader('Content-Type', \str_replace(self::defaultContentType, $requestedContentType, $originalContentTypeHeader));
+        if (strpos($originalContentTypeHeader, self::defaultContentType) !== 0
+            || strpos($originalContentTypeHeader, $requestedContentType) === 0
+        ) {
+            return $response;
         }
-
-        return $response;
+        return $response->withHeader('Content-Type', \str_replace(self::defaultContentType, $requestedContentType, $originalContentTypeHeader));
     }
 
     /**