[HttpClient] Fix "Undefined array key ..." when processing a NativeResponse

Jean-Beru · Jean-Beru · commit 9ad66e558340 · 2025-01-27T14:55:42.000+01:00
diff --git a/src/Symfony/Component/HttpClient/Response/NativeResponse.php b/src/Symfony/Component/HttpClient/Response/NativeResponse.php
@@ -79,7 +79,7 @@ public function __construct(NativeClientState $multi, $context, string $url, arr
         };
 
         $this->canary = new Canary(static function () use ($multi, $id) {
-            if (null !== ($host = $multi->openHandles[$id][6] ?? null) && 0 >= --$multi->hosts[$host]) {
+            if (null !== ($host = $multi->openHandles[$id][6] ?? null) && isset($multi->hosts[$host]) && 0 >= --$multi->hosts[$host]) {
                 unset($multi->hosts[$host]);
             }
             unset($multi->openHandles[$id], $multi->handlesActivity[$id]);
@@ -302,7 +302,7 @@ private static function perform(ClientState $multi, ?array &$responses = null):
 
                 $multi->handlesActivity[$i][] = null;
                 $multi->handlesActivity[$i][] = $e;
-                if (null !== ($host = $multi->openHandles[$i][6] ?? null) && 0 >= --$multi->hosts[$host]) {
+                if (null !== ($host = $multi->openHandles[$i][6] ?? null) && isset($multi->hosts[$host]) && 0 >= --$multi->hosts[$host]) {
                     unset($multi->hosts[$host]);
                 }
                 unset($multi->openHandles[$i]);
diff --git a/src/Symfony/Component/HttpClient/Tests/NativeHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/NativeHttpClientTest.php
@@ -45,4 +45,22 @@ public function testHttp2PushVulcainWithUnusedResponse()
     {
         $this->markTestSkipped('NativeHttpClient doesn\'t support HTTP/2.');
     }
+
+    /**
+     * Because the HttpClientDataCollector resets the client when collecting data, we need to ensure that the response
+     * can be processed before and after the reset.
+     * This test will fail with "Undefined array key "127.0.0.1"" if broken.
+     */
+    public function testResponseCanBeProcessedAfterClientReset()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+        $response = $client->request('GET', 'http://127.0.0.1:8057/timeout-body');
+        $stream = $client->stream($response);
+
+        $response->getStatusCode();
+        $client->reset(); // Simulate a reset done by the HttpClientDataCollector
+        $stream->current();
+
+        $this->addToAssertionCount(1);
+    }
 }
