bug #41674 [HttpClient] fix compat with cURL <= 7.37 (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit a04effad3faa · 2021-06-12T11:00:02.000+02:00
This PR was merged into the 5.2 branch. Discussion ---------- [HttpClient] fix compat with cURL <= 7.37 | Q | A | ------------- | --- | Branch? | 5.2 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #41662 | License | MIT | Doc PR | - Commits ------- d8adf51 [HttpClient] fix compat with cURL <= 7.37
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -311,7 +311,7 @@ public function request(string $method, string $url, array $options = []): Respo
         }
 
         foreach ($curlopts as $opt => $value) {
-            if (null !== $value && !curl_setopt($ch, $opt, $value) && \CURLOPT_CERTINFO !== $opt) {
+            if (null !== $value && !curl_setopt($ch, $opt, $value) && \CURLOPT_CERTINFO !== $opt && (!\defined('CURLOPT_HEADEROPT') || \CURLOPT_HEADEROPT !== $opt)) {
                 $constantName = $this->findConstantName($opt);
                 throw new TransportException(sprintf('Curl option "%s" is not supported.', $constantName ?? $opt));
             }
@@ -574,7 +574,6 @@ private function validateExtraCurlOptions(array $options): void
             \CURLOPT_HEADER,
             \CURLOPT_CONNECTTIMEOUT,
             \CURLOPT_CONNECTTIMEOUT_MS,
-            \CURLOPT_HEADEROPT,
             \CURLOPT_HTTP_VERSION,
             \CURLOPT_PORT,
             \CURLOPT_DNS_USE_GLOBAL_CACHE,
@@ -588,6 +587,10 @@ private function validateExtraCurlOptions(array $options): void
             $curloptsToCheck[] = \CURLOPT_HTTP09_ALLOWED;
         }
 
+        if (\defined('CURLOPT_HEADEROPT')) {
+            $curloptsToCheck[] = \CURLOPT_HEADEROPT;
+        }
+
         $methodOpts = [
             \CURLOPT_POST,
             \CURLOPT_PUT,
