Merge branch '6.4' into 7.2

xabbuh · xabbuh · commit 04738bc372c5 · 2025-02-04T20:54:49.000+01:00
* 6.4:
  pass CURLOPT_INFILESIZE_LARGE only when supported
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -320,8 +320,8 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         foreach ($curlopts as $opt => $value) {
-            if (\CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {
-                $opt = 115; // 115 === CURLOPT_INFILESIZE_LARGE, but it's not defined in PHP
+            if (\PHP_INT_SIZE === 8 && \defined('CURLOPT_INFILESIZE_LARGE') && \CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {
+                $opt = \CURLOPT_INFILESIZE_LARGE;
             }
             if (null !== $value && !curl_setopt($ch, $opt, $value) && \CURLOPT_CERTINFO !== $opt && (!\defined('CURLOPT_HEADEROPT') || \CURLOPT_HEADEROPT !== $opt)) {
                 $constantName = $this->findConstantName($opt);

Original file line number	Diff line number	Diff line change
`@@ -320,8 +320,8 @@ public function request(string $method, string $url, array $options = []): Respo`
`320`	`320`	`}`
`321`	`321`
`322`	`322`	`foreach ($curlopts as $opt => $value) {`
`323`		`- if (\CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {`
`324`		`- $opt = 115; // 115 === CURLOPT_INFILESIZE_LARGE, but it's not defined in PHP`
	`323`	`+ if (\PHP_INT_SIZE === 8 && \defined('CURLOPT_INFILESIZE_LARGE') && \CURLOPT_INFILESIZE === $opt && $value >= 1 << 31) {`
	`324`	`+ $opt = \CURLOPT_INFILESIZE_LARGE;`
`325`	`325`	`}`
`326`	`326`	`if (null !== $value && !curl_setopt($ch, $opt, $value) && \CURLOPT_CERTINFO !== $opt && (!\defined('CURLOPT_HEADEROPT') \|\| \CURLOPT_HEADEROPT !== $opt)) {`
`327`	`327`	`$constantName = $this->findConstantName($opt);`