symfony
diff --git a/‎src/Symfony/Component/HttpClient/Response/AsyncResponse.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Response/AsyncResponse.php
+5-5Lines changed: 5 additions & 5 deletions b/‎src/Symfony/Component/HttpClient/Response/AsyncResponse.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Response/AsyncResponse.php
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
+2Lines changed: 2 additions & 0 deletions b/‎src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php
+2Lines changed: 2 additions & 0 deletions
diff --git a/‎src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
+32Lines changed: 32 additions & 0 deletions b/‎src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
Copy file name to clipboardExpand all lines: src/Symfony/Component/HttpClient/Tests/AsyncDecoratorTraitTest.php
+32Lines changed: 32 additions & 0 deletions
@@ -206,6 +206,11 @@ public static function stream(iterable $responses, float $timeout = null, string
             foreach ($client->stream($wrappedResponses, $timeout) as $response => $chunk) {
                 $r = $asyncMap[$response];
 
+                if (null === $chunk->getError() && $chunk->isFirst()) {
+                    // Ensure no exception is thrown on destruct for the wrapped response
+                    $r->response->getStatusCode();
+                }
+
                 if (!$r->passthru) {
                     if (null !== $chunk->getError() || $chunk->isLast()) {
                         unset($asyncMap[$response]);
@@ -219,11 +224,6 @@ public static function stream(iterable $responses, float $timeout = null, string
                     continue;
                 }
 
-                if (null === $chunk->getError() && $chunk->isFirst()) {
-                    // Ensure no exception is thrown on destruct for the wrapped response
-                    $r->response->getStatusCode();
-                }
-
                 foreach (self::passthru($r->client, $r, $chunk, $asyncMap) as $chunk) {
                     yield $r => $chunk;
                 }
 
@@ -54,6 +54,8 @@ public function getContent(bool $throw = true): string
             foreach (self::stream([$this]) as $chunk) {
                 if (!$chunk->isLast()) {
                     $content .= $chunk->getContent();
+                } elseif (null === $content) {
+                    $content = '';
                 }
             }
 
 
@@ -62,6 +62,38 @@ public function testRetry404()
         $this->assertSame(200, $response->getStatusCode());
     }
 
+    public function testRetry404WithoutThrow()
+    {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            $this->assertTrue($chunk->isFirst());
+            $this->assertSame(404, $context->getStatusCode());
+            $context->getResponse()->cancel();
+            $context->replaceRequest('GET', 'http://localhost:8057/404');
+            $context->passthru();
+        });
+
+        $response = $client->request('GET', 'http://localhost:8057/404');
+        // This should not trigger exception
+        $response->getContent(false);
+    }
+
+    public function testRetry404WithThrow()
+    {
+        $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
+            $this->assertTrue($chunk->isFirst());
+            $this->assertSame(404, $context->getStatusCode());
+            $context->getResponse()->cancel();
+            $context->replaceRequest('GET', 'http://localhost:8057/404');
+            $context->passthru();
+        });
+
+        $response = $client->request('GET', 'http://localhost:8057/404');
+
+        $this->expectException('Symfony\Component\HttpClient\Exception\ClientException');
+        // This should trigger exception
+        $response->getContent(true);
+    }
+
     public function testRetryTransportError()
     {
         $client = $this->getHttpClient(__FUNCTION__, function (ChunkInterface $chunk, AsyncContext $context) {
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ public function getContent(bool $throw = true): string`
`54`	`54`	`foreach (self::stream([$this]) as $chunk) {`
`55`	`55`	`if (!$chunk->isLast()) {`
`56`	`56`	`$content .= $chunk->getContent();`
	`57`	`+ } elseif (null === $content) {`
	`58`	`+ $content = '';`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`