Merge branch '4.4' into 5.4

* 4.4:
  [HttpClient] fix sending PUT requests with curl

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 (\is_string($options['body']) && '' !== $options['body'] && !isset($options['normalized_headers']['content-type'])) {
             $options['headers'][] = 'Content-Type: application/x-www-form-urlencoded';
         }
 

CurlHttpClient.php

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

NativeHttpClient.php

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

Tests/HttpClientTestCase.php

@@ -408,6 +408,18 @@ public function testRedirectAfterPost()
         $this->assertSame(200, $response->getStatusCode());
     }
 
+    public function testEmptyPut()
+    {
+        $client = $this->getHttpClient(__FUNCTION__);
+
+        $response = $client->request('PUT', 'http://localhost:8057/post', [
+            'headers' => ['Content-Length' => '0'],
+        ]);
+
+        $this->assertSame(200, $response->getStatusCode());
+        $this->assertStringContainsString("\r\nContent-Length: ", $response->getInfo('debug'));
+    }
+
     public function testNullBody()
     {
         $client = $this->getHttpClient(__FUNCTION__);