Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 2de0ebebba67 · 2022-03-22T17:03:33.000+01:00
* 4.4: Revert "bug #45813 [HttpClient] Move Content-Type after Content-Length (nicolas-grekas)"
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -171,13 +171,6 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         }
 
         $options['max_duration'] = isset($options['max_duration']) ? (float) $options['max_duration'] : 0;
-
-        if (isset($options['normalized_headers']['content-length']) && $contentType = $options['normalized_headers']['content-type'] ?? null) {
-            // Move Content-Type after Content-Length, see https://bugs.php.net/44603
-            unset($options['normalized_headers']['content-type']);
-            $options['normalized_headers']['content-type'] = $contentType;
-        }
-
         $options['headers'] = array_merge(...array_values($options['normalized_headers']));
 
         return [$url, $options];
diff --git a/src/Symfony/Component/HttpClient/Tests/ScopingHttpClientTest.php b/src/Symfony/Component/HttpClient/Tests/ScopingHttpClientTest.php
@@ -73,7 +73,7 @@ public function testMatchingUrlsAndOptions()
 
         $response = $client->request('GET', 'http://example.com/foo-bar', ['json' => ['url' => 'http://example.com']]);
         $requestOptions = $response->getRequestOptions();
-        $this->assertSame('Content-Type: application/json', $requestOptions['headers'][3]);
+        $this->assertSame('Content-Type: application/json', $requestOptions['headers'][1]);
         $requestJson = json_decode($requestOptions['body'], true);
         $this->assertSame('http://example.com', $requestJson['url']);
         $this->assertSame('X-FooBar: '.$defaultOptions['.*/foo-bar']['headers']['X-FooBar'], $requestOptions['headers'][0]);
