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 --- lib/lib_rss.php | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'lib/lib_rss.php') diff --git a/lib/lib_rss.php b/lib/lib_rss.php index 2a5bdd02f..f0a070820 100644 --- a/lib/lib_rss.php +++ b/lib/lib_rss.php @@ -329,6 +329,13 @@ function customSimplePie(array $attributes = [], array $curl_options = []): \Sim } } } + if (!empty($curl_options[CURLOPT_PROXYTYPE]) && ($curl_options[CURLOPT_PROXYTYPE] < 0 || $curl_options[CURLOPT_PROXYTYPE] === 3)) { + // 3 is legacy for NONE + unset($curl_options[CURLOPT_PROXYTYPE]); + if (isset($curl_options[CURLOPT_PROXY])) { + unset($curl_options[CURLOPT_PROXY]); + } + } $simplePie->set_curl_options($curl_options); $simplePie->strip_comments(true); -- cgit v1.2.3