public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2026-01-28 10:17:11 +00:00
Code Issues Releases Wiki Activity

drop support for (obsolete, removed from recent php versions) php safe_mode setting

Browse Source 
remove ugly hacks for curl + open_basedir combination breaking support for http redirects
This commit is contained in:
Andrew Dolgov
2015-11-19 20:05:17 +03:00
parent 6497fb65b4
commit 4c46702672
8 changed files with 17 additions and 160 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
include/functions.php Normal file → Executable file
View File

@@ -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");
}