public/tt-rss
1
0
Fork 0
mirror of https://git.tt-rss.org/git/tt-rss.git synced 2025-12-24 04:21:29 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into tunable-fetches

Browse Source 
Conflicts:
	include/rssfuncs.php
This commit is contained in:
Barak Korren
2013-04-01 16:05:48 +03:00
parent 83dff597ce 8401101d50
commit 32b7a340ad
4 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.php
View File

@@ -307,8 +307,8 @@
array("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $timestamp)));
}
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, $timeout ? $timeout : 15);
curl_setopt($ch, CURLOPT_TIMEOUT, $timeout ? $timeout : 45);
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_MAXREDIRS, 20);
curl_setopt($ch, CURLOPT_BINARYTRANSFER, true);