From: Barak Korren <barak.korren@gmail.com>
Date: Mon, 1 Apr 2013 13:05:48 +0000 (+0300)
Subject: Merge branch 'master' into tunable-fetches
X-Git-Tag: 1.7.6~5^2~4
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=32b7a340adb9c1acd209049512c0b5d53ed04276;p=tt-rss.git

Merge branch 'master' into tunable-fetches

Conflicts:
	include/rssfuncs.php
---

32b7a340adb9c1acd209049512c0b5d53ed04276
diff --cc include/rssfuncs.php
index e3b1e44b,5c37b752..ce197156
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@@ -283,11 -283,10 +283,12 @@@
  					_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
  				}
  
 +				$force_refetch = isset($_REQUEST["force_refetch"]);
 +
  				$feed_data = fetch_file_contents($fetch_url, false,
- 					$auth_login, $auth_pass, false, $no_cache ? 15 : 45,
+ 					$auth_login, $auth_pass, false, 
+ 					$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
 -					max($last_updated_timestamp, $cache_timestamp));
 +					$force_refetch ? 0 : max($last_updated_timestamp, $cache_timestamp));
  
  				if ($debug_enabled) {
  					_debug("update_rss_feed: fetch done.");