Merge branch '4.4' into 5.4

* 4.4:
  [HttpClient] always send Content-Type when a body is passed

Author: nicolas-grekas

AmpHttpClient.php

@@ -92,7 +92,7 @@ public function request(string $method, string $url, array $options = []): Respo
             }
         }
 
-        if (('' !== $options['body'] || 'POST' === $method) && !isset($options['normalized_headers']['content-type'])) {
+        if (('' !== $options['body'] || 'POST' === $method || isset($options['normalized_headers']['content-length'])) && !isset($options['normalized_headers']['content-type'])) {
             $options['headers'][] = 'Content-Type: application/x-www-form-urlencoded';
         }
 

CurlHttpClient.php

@@ -245,13 +245,13 @@ public function request(string $method, string $url, array $options = []): Respo
 
             if ('POST' !== $method) {
                 $curlopts[\CURLOPT_UPLOAD] = true;
+
+                if (!isset($options['normalized_headers']['content-type'])) {
+                    $curlopts[\CURLOPT_HTTPHEADER][] = 'Content-Type: application/x-www-form-urlencoded';
+                }
             }
         } elseif ('' !== $body || 'POST' === $method || $hasContentLength) {
             $curlopts[\CURLOPT_POSTFIELDS] = $body;
-
-            if ('' === $body && 'POST' !== $method && !isset($options['normalized_headers']['content-type'])) {
-                $curlopts[\CURLOPT_HTTPHEADER][] = 'Content-Type:';
-            }
         }
 
         if ($options['peer_fingerprint']) {

NativeHttpClient.php

@@ -81,14 +81,15 @@ public function request(string $method, string $url, array $options = []): Respo
             }
         }
 
-        $sendContentLength = !\is_string($options['body']) || 'POST' === $method;
+        $hasContentLength = isset($options['normalized_headers']['content-length']);
+        $hasBody = '' !== $options['body'] || 'POST' === $method || $hasContentLength;
 
         $options['body'] = self::getBodyAsString($options['body']);
 
-        if ('' === $options['body'] && $sendContentLength && !isset($options['normalized_headers']['content-length'])) {
+        if ('' === $options['body'] && $hasBody && !$hasContentLength) {
             $options['headers'][] = 'Content-Length: 0';
         }
-        if (('' !== $options['body'] || 'POST' === $method) && !isset($options['normalized_headers']['content-type'])) {
+        if ($hasBody && !isset($options['normalized_headers']['content-type'])) {
             $options['headers'][] = 'Content-Type: application/x-www-form-urlencoded';
         }