diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-10-08 17:26:43 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-10-08 17:26:43 +0200 |
| commit | 1eb19409b5435546774425c00523b9f88d4fccf9 (patch) | |
| tree | 9c30d510a3604826ebea1492276278ae905e6979 /lib/favicons.php | |
| parent | 05228ed92fc26b17861c1d3b7939d6faaf5ec104 (diff) | |
CURLOPT_FOLLOWLOCATION open_basedir bug (#1657)
CURLOPT_FOLLOWLOCATION cannot be activated when an open_basedir is set
https://github.com/FreshRSS/FreshRSS/issues/1655#issuecomment-334999448
https://stackoverflow.com/questions/6918623/curlopt-followlocation-cannot-be-activated
Diffstat (limited to 'lib/favicons.php')
| -rw-r--r-- | lib/favicons.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/favicons.php b/lib/favicons.php index 80246ee74..2d6f7aab7 100644 --- a/lib/favicons.php +++ b/lib/favicons.php @@ -31,12 +31,12 @@ function downloadHttp(&$url, $curlOptions = array()) { } $ch = curl_init($url); curl_setopt_array($ch, array( - CURLOPT_FOLLOWLOCATION => true, - CURLOPT_MAXREDIRS => 10, CURLOPT_RETURNTRANSFER => true, CURLOPT_TIMEOUT => 15, CURLOPT_USERAGENT => FRESHRSS_USERAGENT, + CURLOPT_MAXREDIRS => 10, )); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true); //Keep option separated for open_basedir bug if (defined('CURLOPT_ENCODING')) { curl_setopt($ch, CURLOPT_ENCODING, ''); //Enable all encodings } |