[HttpClient] Fix Content-Length header when possible

nicolas-grekas · nicolas-grekas · commit ad21dbe75069 · 2022-01-31T19:19:20.000+01:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -86,6 +86,11 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         if (isset($options['body'])) {
             $options['body'] = self::normalizeBody($options['body']);
+
+            if (\is_string($options['body']) && (string) \strlen($options['body']) !== substr($h = $options['normalized_headers']['content-length'][0] ?? '', 16)) {
+                $options['normalized_headers']['content-length'][0] = substr_replace($h, \strlen($options['body']), 16);
+                $options['headers'] = array_merge(...array_values($options['normalized_headers']) ?: [[]]);
+            }
         }
 
         if (isset($options['peer_fingerprint'])) {
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTestCase.php
@@ -180,6 +180,21 @@ public function testDebugInfoOnDestruct()
         $this->assertNotEmpty($traceInfo['debug']);
     }
 
+    public function testFixContentLength()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $response = $client->request('POST', 'http://localhost:8057/post', [
+            'body' => 'abc=def',
+            'headers' => ['Content-Length: 4'],
+
+        ]);
+
+        $body = $response->toArray();
+
+        $this->assertSame(['abc' => 'def', 'REQUEST_METHOD' => 'POST'], $body);
+    }
+
     public function testNegativeTimeout()
     {
         $client = $this->getHttpClient(__FUNCTION__);
