diff options
| author | Andrew Dolgov <[email protected]> | 2013-04-16 20:40:14 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2013-04-16 20:40:14 +0400 |
| commit | 438a3ecb04f9889f281ef1c72d6932b8c367deb5 (patch) | |
| tree | 77221e1e358b5d7d317257b280c3e87b1e4887ba /include | |
| parent | e2261e177bc9f5308185d91783ca128000c6fd87 (diff) | |
disable FOLLOWLOCATION when under open_basedir
Diffstat (limited to 'include')
| -rw-r--r-- | include/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/functions.php b/include/functions.php index 621357ea6..0148d069d 100644 --- a/include/functions.php +++ b/include/functions.php @@ -324,7 +324,7 @@ if (!defined('NO_CURL') && function_exists('curl_init') && !ini_get("open_basedir")) { - if (ini_get("safe_mode")) { + if (ini_get("safe_mode") || ini_get("open_basedir")) { $ch = curl_init(geturl($url)); } else { $ch = curl_init($url); @@ -337,7 +337,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("safe_mode")); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("safe_mode") && !ini_get("open_basedir")); curl_setopt($ch, CURLOPT_MAXREDIRS, 20); curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); |