bug #59763 [HttpClient] Don't send any default content-type when the body is empty (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 08a6428b478f · 2025-02-13T11:19:26.000+01:00
This PR was merged into the 6.4 branch. Discussion ---------- [HttpClient] Don't send any default content-type when the body is empty | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Issues | - | License | MIT Issue was introduced in #49911 Commits ------- 4a475e0 [HttpClient] Don't send any default content-type when the body is empty
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -356,9 +356,11 @@ private static function normalizeBody($body, array &$normalizedHeaders = [])
                 }
             });
 
-            $body = http_build_query($body, '', '&');
+            if ('' === $body = http_build_query($body, '', '&')) {
+                return '';
+            }
 
-            if ('' === $body || !$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {
+            if (!$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {
                 if (!str_contains($normalizedHeaders['content-type'][0] ?? '', 'application/x-www-form-urlencoded')) {
                     $normalizedHeaders['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];
                 }

Original file line number	Diff line number	Diff line change
`@@ -356,9 +356,11 @@ private static function normalizeBody($body, array &$normalizedHeaders = [])`
`356`	`356`	`}`
`357`	`357`	`});`
`358`	`358`
`359`		`- $body = http_build_query($body, '', '&');`
	`359`	`+ if ('' === $body = http_build_query($body, '', '&')) {`
	`360`	`+ return '';`
	`361`	`+ }`
`360`	`362`
`361`		`- if ('' === $body \|\| !$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {`
	`363`	`+ if (!$streams && !str_contains($normalizedHeaders['content-type'][0] ?? '', 'multipart/form-data')) {`
`362`	`364`	`if (!str_contains($normalizedHeaders['content-type'][0] ?? '', 'application/x-www-form-urlencoded')) {`
`363`	`365`	`$normalizedHeaders['content-type'] = ['Content-Type: application/x-www-form-urlencoded'];`
`364`	`366`	`}`