Merge branch '5.1' into 5.2

derrabus · derrabus · commit b458d19fe834 · 2021-01-19T22:00:40.000+01:00
* 5.1: [HttpFoundation] Drop int return type from parseFilesize() Added $translator->addLoader() bug symfony/symfony#39878 [doctrine-bridge] Add username to UserNameNotFoundException [Uid] Clarify the format returned by getTime() fix spelling Add check for constant in Curl client Revert #38614, add assert to avoid regression Fix container injection with TypedReference Fix problem when SYMFONY_PHPUNIT_VERSION is empty string value Update PHP CS Fixer config to v2.18
diff --git a/CurlHttpClient.php b/CurlHttpClient.php
@@ -173,7 +173,7 @@ public function request(string $method, string $url, array $options = []): Respo
             $curlopts[\CURLOPT_DNS_USE_GLOBAL_CACHE] = false;
         }
 
-        if (\defined('CURLOPT_HEADEROPT')) {
+        if (\defined('CURLOPT_HEADEROPT') && \defined('CURLHEADER_SEPARATE')) {
             $curlopts[\CURLOPT_HEADEROPT] = \CURLHEADER_SEPARATE;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -173,7 +173,7 @@ public function request(string $method, string $url, array $options = []): Respo`
`173`	`173`	`$curlopts[\CURLOPT_DNS_USE_GLOBAL_CACHE] = false;`
`174`	`174`	`}`
`175`	`175`
`176`		`- if (\defined('CURLOPT_HEADEROPT')) {`
	`176`	`+ if (\defined('CURLOPT_HEADEROPT') && \defined('CURLHEADER_SEPARATE')) {`
`177`	`177`	`$curlopts[\CURLOPT_HEADEROPT] = \CURLHEADER_SEPARATE;`
`178`	`178`	`}`
`179`	`179`