Merge branch '4.4' into 5.3

* 4.4:
  [HttpClient] Don't reset timeout counter when initializing requests

Author: nicolas-grekas

src/Symfony/Component/HttpClient/Response/AmpResponse.php

@@ -125,6 +125,7 @@ public function __construct(AmpClientState $multi, Request $request, array $opti
             }
         };
 
+        $multi->lastTimeout = null;
         $multi->openHandles[$id] = $id;
         ++$multi->responseCount;
 

src/Symfony/Component/HttpClient/Response/CommonResponseTrait.php

@@ -145,15 +145,15 @@ public function __wakeup()
      */
     abstract protected function close(): void;
 
-    private static function initialize(self $response, float $timeout = null): void
+    private static function initialize(self $response): void
     {
         if (null !== $response->getInfo('error')) {
             throw new TransportException($response->getInfo('error'));
         }
 
         try {
-            if (($response->initializer)($response, $timeout)) {
-                foreach (self::stream([$response], $timeout) as $chunk) {
+            if (($response->initializer)($response, -0.0)) {
+                foreach (self::stream([$response], -0.0) as $chunk) {
                     if ($chunk->isFirst()) {
                         break;
                     }

src/Symfony/Component/HttpClient/Response/CurlResponse.php

@@ -170,6 +170,7 @@ public function __construct(CurlClientState $multi, $ch, array $options = null,
         };
 
         // Schedule the request in a non-blocking way
+        $multi->lastTimeout = null;
         $multi->openHandles[$id] = [$ch, $options];
         curl_multi_add_handle($multi->handle, $ch);
 

src/Symfony/Component/HttpClient/Response/NativeResponse.php

@@ -196,6 +196,7 @@ private function open(): void
         }
 
         $host = parse_url($this->info['redirect_url'] ?? $this->url, \PHP_URL_HOST);
+        $this->multi->lastTimeout = null;
         $this->multi->openHandles[$this->id] = [&$this->pauseExpiry, $h, $this->buffer, $this->onProgress, &$this->remaining, &$this->info, $host];
         $this->multi->hosts[$host] = 1 + ($this->multi->hosts[$host] ?? 0);
     }

src/Symfony/Component/HttpClient/Response/TransportResponseTrait.php

@@ -138,7 +138,7 @@ private function doDestruct()
         $this->shouldBuffer = true;
 
         if ($this->initializer && null === $this->info['error']) {
-            self::initialize($this, -0.0);
+            self::initialize($this);
             $this->checkStatusCode();
         }
     }

src/Symfony/Component/HttpClient/Tests/MockHttpClientTest.php

@@ -278,6 +278,7 @@ protected function getHttpClient(string $testCase): HttpClientInterface
                 $this->markTestSkipped('Real transport required');
                 break;
 
+            case 'testTimeoutOnInitialize':
             case 'testTimeoutOnDestruct':
                 $this->markTestSkipped('Real transport required');
                 break;

src/Symfony/Component/HttpClient/Tests/NativeHttpClientTest.php

@@ -26,6 +26,11 @@ public function testInformationalResponseStream()
         $this->markTestSkipped('NativeHttpClient doesn\'t support informational status codes.');
     }
 
+    public function testTimeoutOnInitialize()
+    {
+        $this->markTestSkipped('NativeHttpClient doesn\'t support opening concurrent requests.');
+    }
+
     public function testTimeoutOnDestruct()
     {
         $this->markTestSkipped('NativeHttpClient doesn\'t support opening concurrent requests.');

src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php

@@ -835,6 +835,39 @@ public function testTimeoutWithActiveConcurrentStream()
         }
     }
 
+    public function testTimeoutOnInitialize()
+    {
+        $p1 = TestHttpServer::start(8067);
+        $p2 = TestHttpServer::start(8077);
+
+        $client = $this->getHttpClient(__FUNCTION__);
+        $start = microtime(true);
+        $responses = [];
+
+        $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
+
+        try {
+            foreach ($responses as $response) {
+                try {
+                    $response->getContent();
+                    $this->fail(TransportExceptionInterface::class.' expected');
+                } catch (TransportExceptionInterface $e) {
+                }
+            }
+            $responses = [];
+
+            $duration = microtime(true) - $start;
+
+            $this->assertLessThan(1.0, $duration);
+        } finally {
+            $p1->stop();
+            $p2->stop();
+        }
+    }
+
     public function testTimeoutOnDestruct()
     {
         $p1 = TestHttpServer::start(8067);