bug #44743 [HttpClient] fix checking for recent curl consts (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit 6b8b4abb3740 · 2021-12-22T17:21:54.000+01:00
This PR was merged into the 5.3 branch. Discussion ---------- [HttpClient] fix checking for recent curl consts | Q | A | ------------- | --- | Branch? | 5.3 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix #42061 | License | MIT | Doc PR | - Commits ------- 0d477e9 [HttpClient] fix checking for recent curl consts
diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php
@@ -439,8 +439,6 @@ private function validateExtraCurlOptions(array $options): void
             \CURLOPT_INFILESIZE => 'body',
             \CURLOPT_POSTFIELDS => 'body',
             \CURLOPT_UPLOAD => 'body',
-            \CURLOPT_PINNEDPUBLICKEY => 'peer_fingerprint',
-            \CURLOPT_UNIX_SOCKET_PATH => 'bindto',
             \CURLOPT_INTERFACE => 'bindto',
             \CURLOPT_TIMEOUT_MS => 'max_duration',
             \CURLOPT_TIMEOUT => 'max_duration',
@@ -463,6 +461,14 @@ private function validateExtraCurlOptions(array $options): void
             \CURLOPT_PROGRESSFUNCTION => 'on_progress',
         ];
 
+        if (\defined('CURLOPT_UNIX_SOCKET_PATH')) {
+            $curloptsToConfig[\CURLOPT_UNIX_SOCKET_PATH] = 'bindto';
+        }
+
+        if (\defined('CURLOPT_PINNEDPUBLICKEY')) {
+            $curloptsToConfig[\CURLOPT_PINNEDPUBLICKEY] = 'peer_fingerprint';
+        }
+
         $curloptsToCheck = [
             \CURLOPT_PRIVATE,
             \CURLOPT_HEADERFUNCTION,
