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/views/helpers/export/opml.phtml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/views/helpers/export') diff --git a/app/views/helpers/export/opml.phtml b/app/views/helpers/export/opml.phtml index 37e728470..fba6d2498 100644 --- a/app/views/helpers/export/opml.phtml +++ b/app/views/helpers/export/opml.phtml @@ -107,6 +107,9 @@ function feedsToOutlines(array $feeds, bool $excludeMutedFeeds = false): array { $outline['frss:CURLOPT_POSTFIELDS'] = $curl_params[CURLOPT_POSTFIELDS] ?? null; $outline['frss:CURLOPT_PROXY'] = $curl_params[CURLOPT_PROXY] ?? null; $outline['frss:CURLOPT_PROXYTYPE'] = $curl_params[CURLOPT_PROXYTYPE] ?? null; + if ($outline['frss:CURLOPT_PROXYTYPE'] === 3) { // Legacy for NONE + $outline['frss:CURLOPT_PROXYTYPE'] = -1; + } $outline['frss:CURLOPT_USERAGENT'] = $curl_params[CURLOPT_USERAGENT] ?? null; if (!empty($curl_params[CURLOPT_HTTPHEADER]) && is_array($curl_params[CURLOPT_HTTPHEADER])) { -- cgit v1.2.3