From 22b74b0a5790360d81088a83addab1f98b7f7947 Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Sat, 25 Jan 2025 09:14:08 +0100 Subject: Improve cURL proxy options (#7231) 3 is now used for CURLPROXY_HTTPS2 https://github.com/curl/curl/blob/f07612cd9ae1ec50b9bedd749171ad75203c9e7e/include/curl/curl.h#L789 Related to https://github.com/FreshRSS/FreshRSS/issues/7209 --- app/Services/ImportService.php | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/Services') diff --git a/app/Services/ImportService.php b/app/Services/ImportService.php index 00bb89229..96591053b 100644 --- a/app/Services/ImportService.php +++ b/app/Services/ImportService.php @@ -296,6 +296,9 @@ class FreshRSS_Import_Service { } if (isset($feed_elt['frss:CURLOPT_PROXYTYPE'])) { $curl_params[CURLOPT_PROXYTYPE] = (int)$feed_elt['frss:CURLOPT_PROXYTYPE']; + if ($curl_params[CURLOPT_PROXYTYPE] === 3) { // Legacy for NONE + $curl_params[CURLOPT_PROXYTYPE] = -1; + } } if (isset($feed_elt['frss:CURLOPT_USERAGENT'])) { $curl_params[CURLOPT_USERAGENT] = $feed_elt['frss:CURLOPT_USERAGENT']; -- cgit v1.2.3