From fabfb9fc2aabedfb1045a2036e9eecae1d9ad300 Mon Sep 17 00:00:00 2001 From: JustAMacUser Date: Sun, 22 Jan 2017 02:12:09 -0500 Subject: [PATCH] Added support to fetch_file_contents() to explicitly set CURLOPT_FOLLOWLOCATION. --- include/functions.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) mode change 100755 => 100644 include/functions.php diff --git a/include/functions.php b/include/functions.php old mode 100755 new mode 100644 index de93267e..17bd9f37 --- a/include/functions.php +++ b/include/functions.php @@ -368,6 +368,7 @@ $timeout = isset($options["timeout"]) ? $options["timeout"] : false; $timestamp = isset($options["timestamp"]) ? $options["timestamp"] : 0; $useragent = isset($options["useragent"]) ? $options["useragent"] : false; + $followlocation = isset($options["followlocation"]) ? $options["followlocation"] : true; $url = ltrim($url, ' '); $url = str_replace(' ', '%20', $url); @@ -388,7 +389,7 @@ curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : FILE_FETCH_CONNECT_TIMEOUT); curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : FILE_FETCH_TIMEOUT); - curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir")); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir") && $followlocation); curl_setopt($ch, CURLOPT_MAXREDIRS, 20); curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); -- 2.39.2