[HttpClient] use ucwords() on header names before sending them

nicolas-grekas · nicolas-grekas · commit c0ef6e65873f · 2019-07-31T00:08:57.000+02:00
diff --git a/src/Symfony/Component/HttpClient/HttpClientTrait.php b/src/Symfony/Component/HttpClient/HttpClientTrait.php
@@ -66,7 +66,7 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
 
         foreach ($options['headers'] as $name => $values) {
             foreach ($values as $value) {
-                $requestHeaders[] = $name.': '.$headers[$name][] = $value = (string) $value;
+                $requestHeaders[] = ucwords($name, '-').': '.$headers[$name][] = $value = (string) $value;
 
                 if (\strlen($value) !== strcspn($value, "\r\n\0")) {
                     throw new InvalidArgumentException(sprintf('Invalid header value: CR/LF/NUL found in "%s".', $value));
@@ -103,11 +103,11 @@ private static function prepareRequest(?string $method, ?string $url, array $opt
         if (null !== $url) {
             // Merge auth with headers
             if (($options['auth_basic'] ?? false) && !($headers['authorization'] ?? false)) {
-                $requestHeaders[] = 'authorization: '.$headers['authorization'][] = 'Basic '.base64_encode($options['auth_basic']);
+                $requestHeaders[] = 'Authorization: '.$headers['authorization'][] = 'Basic '.base64_encode($options['auth_basic']);
             }
             // Merge bearer with headers
             if (($options['auth_bearer'] ?? false) && !($headers['authorization'] ?? false)) {
-                $requestHeaders[] = 'authorization: '.$headers['authorization'][] = 'Bearer '.$options['auth_bearer'];
+                $requestHeaders[] = 'Authorization: '.$headers['authorization'][] = 'Bearer '.$options['auth_bearer'];
             }
 
             $options['request_headers'] = $requestHeaders;
diff --git a/src/Symfony/Component/HttpClient/NativeHttpClient.php b/src/Symfony/Component/HttpClient/NativeHttpClient.php
@@ -74,12 +74,12 @@ public function request(string $method, string $url, array $options = []): Respo
         $options['body'] = self::getBodyAsString($options['body']);
 
         if ('' !== $options['body'] && 'POST' === $method && !isset($options['headers']['content-type'])) {
-            $options['request_headers'][] = 'content-type: application/x-www-form-urlencoded';
+            $options['request_headers'][] = 'Content-Type: application/x-www-form-urlencoded';
         }
 
         if ($gzipEnabled = \extension_loaded('zlib') && !isset($options['headers']['accept-encoding'])) {
             // gzip is the most widely available algo, no need to deal with deflate
-            $options['request_headers'][] = 'accept-encoding: gzip';
+            $options['request_headers'][] = 'Accept-Encoding: gzip';
         }
 
         if ($options['peer_fingerprint']) {
@@ -161,11 +161,11 @@ public function request(string $method, string $url, array $options = []): Respo
         [$host, $port, $url['authority']] = self::dnsResolve($url, $this->multi, $info, $onProgress);
 
         if (!isset($options['headers']['host'])) {
-            $options['request_headers'][] = 'host: '.$host.$port;
+            $options['request_headers'][] = 'Host: '.$host.$port;
         }
 
         if (!isset($options['headers']['user-agent'])) {
-            $options['request_headers'][] = 'user-agent: Symfony HttpClient/Native';
+            $options['request_headers'][] = 'User-Agent: Symfony HttpClient/Native';
         }
 
         $context = [
@@ -393,7 +393,7 @@ private static function createRedirectResolver(array $options, string $host, ?ar
             if (false !== (parse_url($location, PHP_URL_HOST) ?? false)) {
                 // Authorization and Cookie headers MUST NOT follow except for the initial host name
                 $requestHeaders = $redirectHeaders['host'] === $host ? $redirectHeaders['with_auth'] : $redirectHeaders['no_auth'];
-                $requestHeaders[] = 'host: '.$host.$port;
+                $requestHeaders[] = 'Host: '.$host.$port;
                 self::configureHeadersAndProxy($context, $host, $requestHeaders, $proxy, $noProxy);
             }
 
diff --git a/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php b/src/Symfony/Component/HttpClient/Tests/HttpClientTraitTest.php
@@ -173,7 +173,7 @@ public function testAuthBearerOption()
     {
         [, $options] = self::prepareRequest('POST', 'http://example.com', ['auth_bearer' => 'foobar'], HttpClientInterface::OPTIONS_DEFAULTS);
         $this->assertSame('Bearer foobar', $options['headers']['authorization'][0]);
-        $this->assertSame('authorization: Bearer foobar', $options['request_headers'][0]);
+        $this->assertSame('Authorization: Bearer foobar', $options['request_headers'][0]);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -74,12 +74,12 @@ public function request(string $method, string $url, array $options = []): Respo`
`74`	`74`	`$options['body'] = self::getBodyAsString($options['body']);`
`75`	`75`
`76`	`76`	`if ('' !== $options['body'] && 'POST' === $method && !isset($options['headers']['content-type'])) {`
`77`		`- $options['request_headers'][] = 'content-type: application/x-www-form-urlencoded';`
	`77`	`+ $options['request_headers'][] = 'Content-Type: application/x-www-form-urlencoded';`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`if ($gzipEnabled = \extension_loaded('zlib') && !isset($options['headers']['accept-encoding'])) {`
`81`	`81`	`// gzip is the most widely available algo, no need to deal with deflate`
`82`		`- $options['request_headers'][] = 'accept-encoding: gzip';`
	`82`	`+ $options['request_headers'][] = 'Accept-Encoding: gzip';`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`if ($options['peer_fingerprint']) {`
`@@ -161,11 +161,11 @@ public function request(string $method, string $url, array $options = []): Respo`
`161`	`161`	`[$host, $port, $url['authority']] = self::dnsResolve($url, $this->multi, $info, $onProgress);`
`162`	`162`
`163`	`163`	`if (!isset($options['headers']['host'])) {`
`164`		`- $options['request_headers'][] = 'host: '.$host.$port;`
	`164`	`+ $options['request_headers'][] = 'Host: '.$host.$port;`
`165`	`165`	`}`
`166`	`166`
`167`	`167`	`if (!isset($options['headers']['user-agent'])) {`
`168`		`- $options['request_headers'][] = 'user-agent: Symfony HttpClient/Native';`
	`168`	`+ $options['request_headers'][] = 'User-Agent: Symfony HttpClient/Native';`
`169`	`169`	`}`
`170`	`170`
`171`	`171`	`$context = [`
`@@ -393,7 +393,7 @@ private static function createRedirectResolver(array $options, string $host, ?ar`
`393`	`393`	`if (false !== (parse_url($location, PHP_URL_HOST) ?? false)) {`
`394`	`394`	`// Authorization and Cookie headers MUST NOT follow except for the initial host name`
`395`	`395`	`$requestHeaders = $redirectHeaders['host'] === $host ? $redirectHeaders['with_auth'] : $redirectHeaders['no_auth'];`
`396`		`- $requestHeaders[] = 'host: '.$host.$port;`
	`396`	`+ $requestHeaders[] = 'Host: '.$host.$port;`
`397`	`397`	`self::configureHeadersAndProxy($context, $host, $requestHeaders, $proxy, $noProxy);`
`398`	`398`	`}`
`399`	`399`
Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public function testAuthBearerOption()`
`173`	`173`	`{`
`174`	`174`	`[, $options] = self::prepareRequest('POST', 'http://example.com', ['auth_bearer' => 'foobar'], HttpClientInterface::OPTIONS_DEFAULTS);`
`175`	`175`	`$this->assertSame('Bearer foobar', $options['headers']['authorization'][0]);`
`176`		`- $this->assertSame('authorization: Bearer foobar', $options['request_headers'][0]);`
	`176`	`+ $this->assertSame('Authorization: Bearer foobar', $options['request_headers'][0]);`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`/**`