Merge branch '4.3' into 4.4

nicolas-grekas · nicolas-grekas · commit b82c06076177 · 2019-11-06T13:02:32.000+01:00
* 4.3:
  [HttpClient] expose only gzip when doing transparent compression
  add species to inflector and inflector tests
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -232,8 +232,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
`@@ -232,8 +232,8 @@ public function request(string $method, string $url, array $options = []): Respo`
`232`	`232`	`$curlopts[CURLOPT_NOSIGNAL] = true;`
`233`	`233`	`}`
`234`	`234`
`235`		`- if (!isset($options['normalized_headers']['accept-encoding'])) {`
`236`		`- $curlopts[CURLOPT_ENCODING] = ''; // Enable HTTP compression`
	`235`	`+ if (!isset($options['normalized_headers']['accept-encoding']) && CURL_VERSION_LIBZ & self::$curlVersion['features']) {`
	`236`	`+ $curlopts[CURLOPT_ENCODING] = 'gzip'; // Expose only one encoding, some servers mess up when more are provided`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`foreach ($options['headers'] as $header) {`