bug #59250 [HttpClient] Fix a typo in NoPrivateNetworkHttpClient (Jontsa)

GromNaN · GromNaN · commit c2cc75dc8d04 · 2024-12-21T17:18:12.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [HttpClient] Fix a typo in NoPrivateNetworkHttpClient | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | Fix #59244 | License | MIT Fix a typo in NoPrivateNetworkHttpClient that may cause `Undefined array key` error if server returns redirect response to a POST request. Commits ------- e6ec212 [HttpClient] Fix a typo in NoPrivateNetworkHttpClient
diff --git a/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php b/src/Symfony/Component/HttpClient/NoPrivateNetworkHttpClient.php
@@ -138,7 +138,7 @@ public function request(string $method, string $url, array $options = []): Respo
                     $filterContentHeaders = static function ($h) {
                         return 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');
                     };
-                    $options['header'] = array_filter($options['header'], $filterContentHeaders);
+                    $options['headers'] = array_filter($options['headers'], $filterContentHeaders);
                     $redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);
                     $redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);
                 }
diff --git a/src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/NoPrivateNetworkHttpClientTest.php
@@ -173,6 +173,27 @@ public function testNonCallableOnProgressCallback()
         $client->request('GET', $url, ['on_progress' => $customCallback]);
     }
 
+    public function testHeadersArePassedOnRedirect()
+    {
+        $ipAddr = '104.26.14.6';
+        $url = sprintf('http://%s/', $ipAddr);
+        $content = 'foo';
+
+        $callback = function ($method, $url, $options) use ($content): MockResponse {
+            $this->assertArrayHasKey('headers', $options);
+            $this->assertNotContains('content-type: application/json', $options['headers']);
+            $this->assertContains('foo: bar', $options['headers']);
+            return new MockResponse($content);
+        };
+        $responses = [
+            new MockResponse('', ['http_code' => 302, 'redirect_url' => 'http://104.26.14.7']),
+            $callback,
+        ];
+        $client = new NoPrivateNetworkHttpClient(new MockHttpClient($responses));
+        $response = $client->request('POST', $url, ['headers' => ['foo' => 'bar', 'content-type' => 'application/json']]);
+        $this->assertEquals($content, $response->getContent());
+    }
+
     private function getMockHttpClient(string $ipAddr, string $content)
     {
         return new MockHttpClient(new MockResponse($content, ['primary_ip' => $ipAddr]));

Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public function request(string $method, string $url, array $options = []): Respo`
`138`	`138`	`$filterContentHeaders = static function ($h) {`
`139`	`139`	`return 0 !== stripos($h, 'Content-Length:') && 0 !== stripos($h, 'Content-Type:') && 0 !== stripos($h, 'Transfer-Encoding:');`
`140`	`140`	`};`
`141`		`- $options['header'] = array_filter($options['header'], $filterContentHeaders);`
	`141`	`+ $options['headers'] = array_filter($options['headers'], $filterContentHeaders);`
`142`	`142`	`$redirectHeaders['no_auth'] = array_filter($redirectHeaders['no_auth'], $filterContentHeaders);`
`143`	`143`	`$redirectHeaders['with_auth'] = array_filter($redirectHeaders['with_auth'], $filterContentHeaders);`
`144`	`144`	`}`