Merge branch '4.3' into 4.4

Kyra Farrow · Nicolas Grekas · commit e89856a2ccc5 · 2019-09-08T22:40:04.000+02:00
* 4.3:
  SCA: minor code tweaks
  [HttpClient] fallbackto CURLMOPT_MAXCONNECTS when CURLMOPT_MAX_HOST_CONNECTIONS is not available
  fixed typo
  [HttpKernel] Fix Apache mod_expires Session Cache-Control issue
  Fix getFileLinkFormat() to avoid returning the wrong URL in Profiler
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -73,7 +73,10 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections
             curl_multi_setopt($this->multi->handle, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);
         }
         if (\defined('CURLMOPT_MAX_HOST_CONNECTIONS')) {
-            curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX);
+            $maxHostConnections = curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX) ? 0 : $maxHostConnections;
+        }
+        if (\defined('CURLMOPT_MAXCONNECTS') && 0 < $maxHostConnections) {
+            curl_multi_setopt($this->multi->handle, CURLMOPT_MAXCONNECTS, $maxHostConnections);
         }
 
         // Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/77535

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,10 @@ public function __construct(array $defaultOptions = [], int $maxHostConnections`
`73`	`73`	`curl_multi_setopt($this->multi->handle, CURLMOPT_PIPELINING, CURLPIPE_MULTIPLEX);`
`74`	`74`	`}`
`75`	`75`	`if (\defined('CURLMOPT_MAX_HOST_CONNECTIONS')) {`
`76`		`- curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX);`
	`76`	`+ $maxHostConnections = curl_multi_setopt($this->multi->handle, CURLMOPT_MAX_HOST_CONNECTIONS, 0 < $maxHostConnections ? $maxHostConnections : PHP_INT_MAX) ? 0 : $maxHostConnections;`
	`77`	`+ }`
	`78`	`+ if (\defined('CURLMOPT_MAXCONNECTS') && 0 < $maxHostConnections) {`
	`79`	`+ curl_multi_setopt($this->multi->handle, CURLMOPT_MAXCONNECTS, $maxHostConnections);`
`77`	`80`	`}`
`78`	`81`
`79`	`82`	`// Skip configuring HTTP/2 push when it's unsupported or buggy, see https://bugs.php.net/77535`