From 79c891a8b7d411343da698e7fd8e617da7c20020 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <noreply@madoka.volgo-balt.ru>
Date: Wed, 30 Mar 2016 13:32:49 +0300
Subject: [PATCH] set smallish timeout on update check, exclude update checking
on initial load
---
classes/rpc.php | 2 +-
include/functions2.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/classes/rpc.php b/classes/rpc.php
index 235db59ef..617c7a22b 100755
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -346,7 +346,7 @@ class RPC extends Handler_Protected {
if ($reply['error']['code'] == 0) {
$reply['init-params'] = make_init_params();
- $reply['runtime-info'] = make_runtime_info();
+ $reply['runtime-info'] = make_runtime_info(true);
}
print json_encode($reply);
diff --git a/include/functions2.php b/include/functions2.php
index f31a61942..1c2ffb936 100644
--- a/include/functions2.php
+++ b/include/functions2.php
@@ -203,7 +203,7 @@
function check_for_update() {
if (defined("GIT_VERSION_TIMESTAMP")) {
- $content = @fetch_file_contents("http://tt-rss.org/version.json");
+ $content = @fetch_file_contents(array("url" => "http://tt-rss.org/version.json", "timeout" => 5));
if ($content) {
$content = json_decode($content, true);
@@ -221,7 +221,7 @@
return "";
}
- function make_runtime_info() {
+ function make_runtime_info($disable_update_check = false) {
$data = array();
$result = db_query("SELECT MAX(id) AS mid, COUNT(*) AS nf FROM
@@ -240,7 +240,7 @@
$data['reload_on_ts_change'] = !defined('_NO_RELOAD_ON_TS_CHANGE');
- if (CHECK_FOR_UPDATES && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
+ if (CHECK_FOR_UPDATES && !$disable_update_check && $_SESSION["last_version_check"] + 86400 + rand(-1000, 1000) < time()) {
$update_result = @check_for_update();
$data["update_result"] = $update_result;
--
GitLab