diff options
| -rw-r--r-- | CREDITS.md | 1 | ||||
| -rw-r--r-- | lib/favicons.php | 14 |
2 files changed, 13 insertions, 2 deletions
diff --git a/CREDITS.md b/CREDITS.md index 159e5d2b7..1f8267244 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -80,6 +80,7 @@ People are sorted by name so please keep this order. * [hoilc](https://github.com/hoilc): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:hoilc) * [ibiruai](https://github.com/ibiruai): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:ibiruai) * [id-konstantin-stepanov](https://github.com/id-konstantin-stepanov): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:id-konstantin-stepanov) +* [Ilias Vrachnis](https://github.com/vrachnis): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:vrachnis) * [Jake Mannens](https://github.com/jakem72360): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jakem72360) * [Jamie Slome](https://github.com/JamieSlome): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:JamieSlome), [Web](https://418sec.com/) * [Jan Lukas Gernert](https://github.com/jangernert): [contributions](https://github.com/FreshRSS/FreshRSS/pulls?q=is:pr+author:jangernert) diff --git a/lib/favicons.php b/lib/favicons.php index 960a72afc..b5c70d975 100644 --- a/lib/favicons.php +++ b/lib/favicons.php @@ -28,7 +28,7 @@ function isImgMime(string $content): bool { function downloadHttp(string &$url, array $curlOptions = []): string { syslog(LOG_INFO, 'FreshRSS Favicon GET ' . $url); $url = checkUrl($url); - if (!$url) { + if ($url == false) { return ''; } /** @var CurlHandle $ch */ @@ -41,9 +41,19 @@ function downloadHttp(string &$url, array $curlOptions = []): string { CURLOPT_FOLLOWLOCATION => true, CURLOPT_ENCODING => '', //Enable all encodings ]); + + FreshRSS_Context::initSystem(); + $system_conf = FreshRSS_Context::$system_conf; + if (isset($system_conf)) { + curl_setopt_array($ch, $system_conf->curl_options); + } + curl_setopt_array($ch, $curlOptions); - /** @var string $response */ + $response = curl_exec($ch); + if (!is_string($response)) { + $response = ''; + } $info = curl_getinfo($ch); curl_close($ch); if (!empty($info['url'])) { |