From be3ed001a4803b4279c34249f20ebffc13c8cc9b Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Sun, 17 Dec 2017 17:46:04 +0100
Subject: Fix favicon for open_basedir (#1733)

Remove open_basedir warning for CURLOPT_FOLLOWLOCATION with PHP 5.6.0- https://bugs.php.net/bug.php?id=65646
---
 lib/favicons.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/favicons.php b/lib/favicons.php
index 2d6f7aab7..75e40900a 100644
--- a/lib/favicons.php
+++ b/lib/favicons.php
@@ -24,7 +24,7 @@ function isImgMime($content) {
 function downloadHttp(&$url, $curlOptions = array()) {
 	syslog(LOG_INFO, 'FreshRSS Favicon GET ' . $url);
 	if (substr($url, 0, 2) === '//') {
-		$url = 'https:' . $favicon;
+		$url = 'https:' . $url;
 	}
 	if ($url == '' || filter_var($url, FILTER_VALIDATE_URL) === false) {
 		return '';
@@ -36,7 +36,9 @@ function downloadHttp(&$url, $curlOptions = array()) {
 			CURLOPT_USERAGENT => FRESHRSS_USERAGENT,
 			CURLOPT_MAXREDIRS => 10,
 		));
-	curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);	//Keep option separated for open_basedir bug
+	if (ini_get('open_basedir') == '') { // see PHP bug 65646
+		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
+	}
 	if (defined('CURLOPT_ENCODING')) {
 		curl_setopt($ch, CURLOPT_ENCODING, '');	//Enable all encodings
 	}
-- 
cgit v1.2.3