updating: do not use cache timestamp if it is unusable for current feed;

sort chronologically instead of random

diff --git a/include/functions.php b/include/functions.php
index 10a3504f2abcfc7b6f55577cf17cd4a155ce096d..72b20cd062b939042639a9cafb927cc901893e60 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -320,7 +320,7 @@
                                $ch = curl_init($url);
                        }
 
-                       if ($timestamp) {
+                       if ($timestamp && !$post_query) {
                                curl_setopt($ch, CURLOPT_HTTPHEADER,
                                        array("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $timestamp)));
                        }

diff --git a/include/rssfuncs.php b/include/rssfuncs.php
index 870d772031fa2d498054eb8c4bccb1620bdc8c15..e9b9c71422f0649375c1fdf5916de4d3a5a5d781 100644 (file)
--- a/include/rssfuncs.php
+++ b/include/rssfuncs.php
@@ -113,10 +113,8 @@
                $query_limit = "";
                if($limit) $query_limit = sprintf("LIMIT %d", $limit);
 
-               $random_qpart = sql_random_function();
-
                // We search for feed needing update.
-               $result = db_query("SELECT DISTINCT ttrss_feeds.feed_url,$random_qpart
+               $result = db_query("SELECT DISTINCT ttrss_feeds.feed_url
                        FROM
                                ttrss_feeds, ttrss_users, ttrss_user_prefs
                        WHERE
@@ -125,7 +123,7 @@
                                AND ttrss_user_prefs.pref_name = 'DEFAULT_UPDATE_INTERVAL'
                                $login_thresh_qpart $update_limit_qpart
                                $updstart_thresh_qpart
-                       ORDER BY $random_qpart $query_limit");
+                       ORDER BY last_updated $query_limit");
 
                if($debug) _debug(sprintf("Scheduled %d feeds to update...", db_num_rows($result)));
 
@@ -278,6 +276,9 @@
                                        _debug("local cache valid and older than last_updated, nothing to do.", $debug_enabled);
                                        return;
                                }
+               } else {
+                       _debug("local cache will not be used for this feed", $debug_enabled);
+                       $cache_timestamp = 0;
                }
 
                if (!$rss) {