Merge pull request #3250 from kdambekalns/bugfix/handle-streams-of-un…

…known-size BUGFIX: Assume content exists, if stream size is unknown
neos · Dec 6, 2023 · 41eb01f · 41eb01f
2 parents 028b804 + 7da588d
commit 41eb01f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Neos.Flow/Classes/Http/Helper/ResponseInformationHelper.php b/Neos.Flow/Classes/Http/Helper/ResponseInformationHelper.php
@@ -228,7 +228,7 @@ public static function makeStandardsCompliant(ResponseInterface $response, Reque
             }
         }
 
-        if (!$response->hasHeader('Content-Length')) {
+        if (!$response->hasHeader('Content-Length') && $response->getBody()->getSize() !== null) {
             $response = $response->withHeader('Content-Length', $response->getBody()->getSize());
         }
 

diff --git a/Neos.Flow/Classes/Mvc/ActionResponse.php b/Neos.Flow/Classes/Mvc/ActionResponse.php
@@ -345,6 +345,7 @@ public function buildHttpResponse(): ResponseInterface
      */
     private function hasContent(): bool
     {
-        return $this->content->getSize() > 0;
+        $contentSize = $this->content->getSize();
+        return $contentSize === null || $contentSize > 0;
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
             }
-            if (!$response->hasHeader('Content-Length')) {
+            if (!$response->hasHeader('Content-Length') && $response->getBody()->getSize() !== null) {
                 $response = $response->withHeader('Content-Length', $response->getBody()->getSize());
             }
@@ Expand Down @@