[HttpClient] Fix error chunk creation in passthru

rmikalkenas · rmikalkenas · commit c8b180641273 · 2024-01-26T09:14:35.000+02:00
diff --git a/src/Symfony/Component/HttpClient/Response/AsyncResponse.php b/src/Symfony/Component/HttpClient/Response/AsyncResponse.php
@@ -65,7 +65,7 @@ public function __construct(HttpClientInterface $client, string $method, string
             while (true) {
                 foreach (self::stream([$response], $timeout) as $chunk) {
                     if ($chunk->isTimeout() && $response->passthru) {
-                        foreach (self::passthru($response->client, $response, new ErrorChunk($response->offset, new TransportException($chunk->getError()))) as $chunk) {
+                        foreach (self::passthru($response->client, $response, new ErrorChunk($response->offset, $chunk->getError())) as $chunk) {
                             if ($chunk->isFirst()) {
                                 return false;
                             }
@@ -123,9 +123,6 @@ public function getInfo(?string $type = null)
         return $this->info + $this->response->getInfo();
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function toStream(bool $throw = true)
     {
         if ($throw) {
@@ -146,9 +143,6 @@ public function toStream(bool $throw = true)
         return $stream;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function cancel(): void
     {
         if ($this->info['canceled']) {
diff --git a/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/RetryableHttpClientTest.php
@@ -13,6 +13,7 @@
 
 use PHPUnit\Framework\TestCase;
 use Symfony\Component\HttpClient\Exception\ServerException;
+use Symfony\Component\HttpClient\Exception\TimeoutException;
 use Symfony\Component\HttpClient\HttpClient;
 use Symfony\Component\HttpClient\MockHttpClient;
 use Symfony\Component\HttpClient\NativeHttpClient;
@@ -21,6 +22,7 @@
 use Symfony\Component\HttpClient\Retry\GenericRetryStrategy;
 use Symfony\Component\HttpClient\RetryableHttpClient;
 use Symfony\Contracts\HttpClient\Exception\TransportExceptionInterface;
+use Symfony\Contracts\HttpClient\Test\TestHttpServer;
 
 class RetryableHttpClientTest extends TestCase
 {
@@ -244,4 +246,38 @@ public function testRetryOnErrorAssertContent()
         self::assertSame('Test out content', $response->getContent());
         self::assertSame('Test out content', $response->getContent(), 'Content should be buffered');
     }
+
+    /**
+     * @dataProvider provideMethodForHeaderTimeout
+     */
+    public function testRetryOnHeaderTimeout(string $method)
+    {
+        $client = HttpClient::create();
+
+        if ($client instanceof NativeHttpClient) {
+            $this->markTestSkipped('NativeHttpClient cannot timeout before receiving headers');
+        }
+
+        TestHttpServer::start();
+
+        $client = new RetryableHttpClient($client);
+        $response = $client->request($method, 'http://localhost:8057/timeout-header', ['timeout' => 0.1]);
+
+        try {
+            $response->getStatusCode();
+            $this->fail(TimeoutException::class.' expected');
+        } catch (TimeoutException $e) {
+        }
+
+        $this->assertSame('Idle timeout reached for "http://localhost:8057/timeout-header".', $response->getInfo('error'));
+    }
+
+    public function provideMethodForHeaderTimeout(): iterable
+    {
+        yield ['GET'];
+        yield ['POST'];
+        yield ['PUT'];
+        yield ['PATCH'];
+        yield ['DELETE'];
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ public function __construct(HttpClientInterface $client, string $method, string`
`65`	`65`	`while (true) {`
`66`	`66`	`foreach (self::stream([$response], $timeout) as $chunk) {`
`67`	`67`	`if ($chunk->isTimeout() && $response->passthru) {`
`68`		`- foreach (self::passthru($response->client, $response, new ErrorChunk($response->offset, new TransportException($chunk->getError()))) as $chunk) {`
	`68`	`+ foreach (self::passthru($response->client, $response, new ErrorChunk($response->offset, $chunk->getError())) as $chunk) {`
`69`	`69`	`if ($chunk->isFirst()) {`
`70`	`70`	`return false;`
`71`	`71`	`}`
`@@ -123,9 +123,6 @@ public function getInfo(?string $type = null)`
`123`	`123`	`return $this->info + $this->response->getInfo();`
`124`	`124`	`}`
`125`	`125`
`126`		`- /**`
`127`		`- * {@inheritdoc}`
`128`		`- */`
`129`	`126`	`public function toStream(bool $throw = true)`
`130`	`127`	`{`
`131`	`128`	`if ($throw) {`
`@@ -146,9 +143,6 @@ public function toStream(bool $throw = true)`
`146`	`143`	`return $stream;`
`147`	`144`	`}`
`148`	`145`
`149`		`- /**`
`150`		`- * {@inheritdoc}`
`151`		`- */`
`152`	`146`	`public function cancel(): void`
`153`	`147`	`{`
`154`	`148`	`if ($this->info['canceled']) {`