servers/ttrss
1
0
Fork 0
mirror of https://tt-rss.org/git/tt-rss.git synced 2024-06-23 11:46:37 +02:00
Code Issues Releases Wiki Activity

update_rss_feed: disable support for http 304 for the time being

Browse Source
This commit is contained in:
Andrew Dolgov 2016-02-02 14:51:02 +03:00
parent 891b77f90e
commit 0edf1d0dc0
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/rssfuncs.php
View File

@ -314,9 +314,7 @@
feed_url,auth_pass,cache_images, feed_url,auth_pass,cache_images,
mark_unread_on_update, owner_uid, mark_unread_on_update, owner_uid,
pubsub_state, auth_pass_encrypted, pubsub_state, auth_pass_encrypted,
feed_language, feed_language
(SELECT max(date_entered) FROM
ttrss_entries, ttrss_user_entries where ref_id = id AND feed_id = '$feed') AS last_article_timestamp
FROM ttrss_feeds WHERE id = '$feed'"); FROM ttrss_feeds WHERE id = '$feed'");
if (db_num_rows($result) == 0) { if (db_num_rows($result) == 0) {
@ -324,11 +322,6 @@
return false; return false;
} }
$last_article_timestamp = @strtotime(db_fetch_result($result, 0, "last_article_timestamp"));
if (defined('_DISABLE_HTTP_304'))
$last_article_timestamp = 0;
$owner_uid = db_fetch_result($result, 0, "owner_uid"); $owner_uid = db_fetch_result($result, 0, "owner_uid");
$mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result, $mark_unread_on_update = sql_bool_to_bool(db_fetch_result($result,
0, "mark_unread_on_update")); 0, "mark_unread_on_update"));
@ -372,9 +365,10 @@
$rss_hash = false; $rss_hash = false;
$force_refetch = isset($_REQUEST["force_refetch"]); $force_refetch = isset($_REQUEST["force_refetch"]);
$feed_data = "";
foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) { foreach ($pluginhost->get_hooks(PluginHost::HOOK_FETCH_FEED) as $plugin) {
$feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, $last_article_timestamp, $auth_login, $auth_pass); $feed_data = $plugin->hook_fetch_feed($feed_data, $fetch_url, $owner_uid, $feed, 0, $auth_login, $auth_pass);
} }
// try cache // try cache
@ -404,12 +398,10 @@
_debug("not using CURL due to open_basedir restrictions"); _debug("not using CURL due to open_basedir restrictions");
} }
_debug("If-Modified-Since: ".gmdate('D, d M Y H:i:s \G\M\T', $last_article_timestamp), $debug_enabled);
$feed_data = fetch_file_contents($fetch_url, false, $feed_data = fetch_file_contents($fetch_url, false,
$auth_login, $auth_pass, false, $auth_login, $auth_pass, false,
$no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT, $no_cache ? FEED_FETCH_NO_CACHE_TIMEOUT : FEED_FETCH_TIMEOUT,
$force_refetch ? 0 : $last_article_timestamp); 0);
global $fetch_curl_used; global $fetch_curl_used;