[HttpClient] expose only gzip when doing transparent compression

nicolas-grekas · nicolas-grekas · commit 5f0b62ac187d · 2019-11-06T11:21:02.000+01:00
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -210,8 +210,8 @@ public function request(string $method, string $url, array $options = []): Respo
             $curlopts[CURLOPT_NOSIGNAL] = true;
         }
 
-        if (!isset($options['normalized_headers']['accept-encoding'])) {
-            $curlopts[CURLOPT_ENCODING] = ''; // Enable HTTP compression
+        if (!isset($options['normalized_headers']['accept-encoding']) && CURL_VERSION_LIBZ & self::$curlVersion['features']) {
+            $curlopts[CURLOPT_ENCODING] = 'gzip'; // Expose only one encoding, some servers mess up when more are provided
         }
 
         foreach ($options['headers'] as $header) {

Original file line number	Diff line number	Diff line change
`@@ -210,8 +210,8 @@ public function request(string $method, string $url, array $options = []): Respo`
`210`	`210`	`$curlopts[CURLOPT_NOSIGNAL] = true;`
`211`	`211`	`}`
`212`	`212`
`213`		`- if (!isset($options['normalized_headers']['accept-encoding'])) {`
`214`		`- $curlopts[CURLOPT_ENCODING] = ''; // Enable HTTP compression`
	`213`	`+ if (!isset($options['normalized_headers']['accept-encoding']) && CURL_VERSION_LIBZ & self::$curlVersion['features']) {`
	`214`	`+ $curlopts[CURLOPT_ENCODING] = 'gzip'; // Expose only one encoding, some servers mess up when more are provided`
`215`	`215`	`}`
`216`	`216`
`217`	`217`	`foreach ($options['headers'] as $header) {`