From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Sat, 30 Mar 2013 11:35:16 +0000 (+0400)
Subject: if-modified-since: also take last_updated into account
X-Git-Tag: 1.7.6~133
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=31623bfa99dcd0c0abf0cf554ab1e69a12c02d9e;p=tt-rss.git

if-modified-since: also take last_updated into account
---

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 7c668f69..e2b6f57f 100644
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -240,6 +240,7 @@
 		$rss = false;
 		$rss_hash = false;
 		$cache_timestamp = file_exists($cache_filename) ? filemtime($cache_filename) : 0;
+		$last_updated_timestamp = strtotime($last_updated);
 
 		if (file_exists($cache_filename) &&
 			is_readable($cache_filename) &&
@@ -262,11 +263,12 @@
 
 			if (!$feed_data) {
 				if ($debug_enabled) {
-					_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp)");
+					_debug("update_rss_feed: fetching [$fetch_url] (ts: $cache_timestamp/$last_updated_timestamp)");
 				}
 
 				$feed_data = fetch_file_contents($fetch_url, false,
-					$auth_login, $auth_pass, false, $no_cache ? 15 : 45, $cache_timestamp);
+					$auth_login, $auth_pass, false, $no_cache ? 15 : 45,
+					max($last_updated_timestamp, $cache_timestamp));
 
 				if ($debug_enabled) {
 					_debug("update_rss_feed: fetch done.");