[HttpClient] Always "buffer" empty responses

symfony · nicolas-grekas · Oct 2, 2020 · Oct 2, 2020 · Oct 2, 2020 · 03d60fce47f89446d6a6725ce8659911278b4a88
commit 03d60fce47f89446d6a6725ce8659911278b4a88
diff --git a/src/Symfony/Component/HttpClient/Response/ResponseTrait.php b/src/Symfony/Component/HttpClient/Response/ResponseTrait.php
@@ -115,15 +115,13 @@ public function getContent(bool $throw = true): string
                return $content;
            }

-            if ('HEAD' === $this->info['http_method'] || \in_array($this->info['http_code'], [204, 304], true)) {
-                return '';
+            if (null === $this->content) {
+                throw new TransportException('Cannot get the content of the response twice: buffering is disabled.');
+            }
+        } else {
+            foreach (self::stream([$this]) as $chunk) {
+                // Chunks are buffered in $this->content already
            }
-
-            throw new TransportException('Cannot get the content of the response twice: buffering is disabled.');
-        }
-
-        foreach (self::stream([$this]) as $chunk) {
-            // Chunks are buffered in $this->content already
        }

        rewind($this->content);
@@ -376,6 +374,10 @@ public static function stream(iterable $responses, float $timeout = null): \Gene

                                $chunk = new ErrorChunk($response->offset, $e);
                            } else {
+                                if (0 === $response->offset && null === $response->content) {
+                                    $response->content = fopen('php://memory', 'w+');
+                                }
+
                                $chunk = new LastChunk($response->offset);
                            }
                        } elseif ($chunk instanceof ErrorChunk) {