From 0d477e96f74618f6689cd4a36c1e40dfbb692d22 Mon Sep 17 00:00:00 2001 From: Nicolas Grekas Date: Tue, 21 Dec 2021 10:51:04 +0100 Subject: [PATCH] [HttpClient] fix checking for recent curl consts --- src/Symfony/Component/HttpClient/CurlHttpClient.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/Symfony/Component/HttpClient/CurlHttpClient.php b/src/Symfony/Component/HttpClient/CurlHttpClient.php index 658854626b461..2821e10df8465 100644 --- 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,