Merge branch '4.4' into 5.4

nicolas-grekas · nicolas-grekas · commit 3f35854482d9 · 2022-03-25T15:53:02.000+01:00
* 4.4:
  [HttpClient] always send Content-Length when a body is passed
diff --git a/NativeHttpClient.php b/NativeHttpClient.php
@@ -81,9 +81,11 @@ public function request(string $method, string $url, array $options = []): Respo
             }
         }
 
+        $sendContentLength = !\is_string($options['body']) || 'POST' === $method;
+
         $options['body'] = self::getBodyAsString($options['body']);
 
-        if ('' === $options['body'] && 'POST' === $method && !isset($options['normalized_headers']['content-length'])) {
+        if ('' === $options['body'] && $sendContentLength && !isset($options['normalized_headers']['content-length'])) {
             $options['headers'][] = 'Content-Length: 0';
         }
         if (('' !== $options['body'] || 'POST' === $method) && !isset($options['normalized_headers']['content-type'])) {

Original file line number	Diff line number	Diff line change
`@@ -81,9 +81,11 @@ public function request(string $method, string $url, array $options = []): Respo`
`81`	`81`	`}`
`82`	`82`	`}`
`83`	`83`
	`84`	`+ $sendContentLength = !\is_string($options['body']) \|\| 'POST' === $method;`
	`85`	`+`
`84`	`86`	`$options['body'] = self::getBodyAsString($options['body']);`
`85`	`87`
`86`		`- if ('' === $options['body'] && 'POST' === $method && !isset($options['normalized_headers']['content-length'])) {`
	`88`	`+ if ('' === $options['body'] && $sendContentLength && !isset($options['normalized_headers']['content-length'])) {`
`87`	`89`	`$options['headers'][] = 'Content-Length: 0';`
`88`	`90`	`}`
`89`	`91`	`if (('' !== $options['body'] \|\| 'POST' === $method) && !isset($options['normalized_headers']['content-type'])) {`