diff options
| author | Andrew Dolgov <[email protected]> | 2015-11-19 20:05:17 +0300 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2015-11-19 20:05:17 +0300 |
| commit | 4c46702672631c0cf84067d6f2c55b3bfda1db6f (patch) | |
| tree | c9e69577fab4ce761043d696e289261afb632452 /include/functions.php | |
| parent | 6497fb65b439f02cf145c2d0eb4e40803641fbb4 (diff) | |
drop support for (obsolete, removed from recent php versions) php safe_mode setting
remove ugly hacks for curl + open_basedir combination breaking support for http redirects
Diffstat (limited to 'include/functions.php')
| -rwxr-xr-x[-rw-r--r--] | include/functions.php | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/include/functions.php b/include/functions.php index 92d6e9790..8d1c2a625 100644..100755 --- a/include/functions.php +++ b/include/functions.php @@ -351,16 +351,7 @@ $fetch_curl_used = true; - if (ini_get("safe_mode") || ini_get("open_basedir") || defined("FORCE_GETURL")) { - $new_url = geturl($url); - if (!$new_url) { - // geturl has already populated $fetch_last_error - return false; - } - $ch = curl_init($new_url); - } else { - $ch = curl_init($url); - } + $ch = curl_init($url); if ($timestamp && !$post_query) { curl_setopt($ch, CURLOPT_HTTPHEADER, @@ -369,7 +360,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") && !ini_get("open_basedir")); + curl_setopt($ch, CURLOPT_FOLLOWLOCATION, !ini_get("open_basedir")); curl_setopt($ch, CURLOPT_MAXREDIRS, 20); curl_setopt($ch, CURLOPT_BINARYTRANSFER, true); curl_setopt($ch, CURLOPT_RETURNTRANSFER, true); @@ -379,7 +370,7 @@ curl_setopt($ch, CURLOPT_ENCODING, ""); //curl_setopt($ch, CURLOPT_REFERER, $url); - if (!ini_get("safe_mode") && !ini_get("open_basedir")) { + if (!ini_get("open_basedir")) { curl_setopt($ch, CURLOPT_COOKIEJAR, "/dev/null"); } |