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

Author: nicolas-grekas

Response/CurlResponse.php

@@ -148,6 +148,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);
 

Response/NativeResponse.php

@@ -183,6 +183,7 @@ private function open(): void
             return;
         }
 
+        $this->multi->lastTimeout = null;
         $this->multi->openHandles[$this->id] = [$h, $this->buffer, $this->onProgress, &$this->remaining, &$this->info];
     }
 

Response/ResponseTrait.php

@@ -233,15 +233,15 @@ abstract protected static function perform(ClientState $multi, array &$responses
      */
     abstract protected static function select(ClientState $multi, float $timeout): int;
 
-    private static function initialize(self $response, float $timeout = null): void
+    private static function initialize(self $response): void
     {
         if (null !== $response->info['error']) {
             throw new TransportException($response->info['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;
                     }
@@ -304,7 +304,7 @@ private function doDestruct()
         $this->shouldBuffer = true;
 
         if ($this->initializer && null === $this->info['error']) {
-            self::initialize($this, -0.0);
+            self::initialize($this);
             $this->checkStatusCode();
         }
     }

Tests/MockHttpClientTest.php

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

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.');