updaterandomfeed: use max_execution_time parameter

diff --git a/classes/rpc.php b/classes/rpc.php
index 0e93cd32a346db50a6a196c7f49dca9235e50a8a..b4afc6023ae6906b87f7f71004ed75ae47955176 100644 (file)
--- a/classes/rpc.php
+++ b/classes/rpc.php
@@ -699,7 +699,7 @@ class RPC extends Handler_Protected {
                while ($line = db_fetch_assoc($result)) {
                        $feed_id = $line["id"];
 
-                       if (time() - $tstart < 30) {
+                       if (time() - $tstart < ini_get("max_execution_time") * 0.7) {
                                update_rss_feed($this->link, $feed_id, true);
                                ++$num_updated;
                        } else {

diff --git a/config.php-dist b/config.php-dist
index e0949c61e089bc8b514e03bccd4f860da8b4da06..85aad41fe46bc0ab169ba27590ed1c9df7fde0cc 100644 (file)
--- a/config.php-dist
+++ b/config.php-dist
@@ -28,6 +28,11 @@
        // Operate in single user mode, disables all functionality related to
        // multiple users.
 
+       define('SIMPLE_UPDATE_MODE', false);
+       // Enables fallback update mode where tt-rss tries to update feeds in
+       // background while tt-rss is open in your browser. Not recommended, please
+       // read http://tt-rss.org/wiki/UpdatingFeeds for more information.
+
        // *****************************
        // *** Files and directories ***
        // *****************************

diff --git a/include/functions.php b/include/functions.php
index 089bbd8a0bf014de7edf5ef5be0fff15115e6edb..0e1800f2346eeaffd9093f3cffc46a9e85bfbf6a 100644 (file)
--- a/include/functions.php
+++ b/include/functions.php
@@ -1968,7 +1968,7 @@
                $params["csrf_token"] = $_SESSION["csrf_token"];
                $params["widescreen"] = (int) $_SESSION["widescreen"];
 
-               $params['simple_update'] = defined('_SIMPLE_UPDATE_MODE') && _SIMPLE_UPDATE_MODE;
+               $params['simple_update'] = defined('SIMPLE_UPDATE_MODE') && SIMPLE_UPDATE_MODE;
 
                return $params;
        }

diff --git a/include/sanity_config.php b/include/sanity_config.php
index 04058560f7b65f0add25cdd85de1d27233be94f1..f6ec487be99b2fb33c14bdcc26995f71130a1fac 100644 (file)
--- a/include/sanity_config.php
+++ b/include/sanity_config.php
@@ -1,3 +1,3 @@
-<?php # This file has been generated at:  Thu Dec 27 15:13:04 MSK 2012
+<?php # This file has been generated at:  Tue Jan 22 20:00:53 MSK 2013
 define('GENERATED_CONFIG_CHECK', 26);
-$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'FEEDBACK_URL', 'CONFIG_VERSION'); ?>
+$requred_defines = array( 'DB_TYPE', 'DB_HOST', 'DB_USER', 'DB_NAME', 'DB_PASS', 'MYSQL_CHARSET', 'SELF_URL_PATH', 'SINGLE_USER_MODE', 'SIMPLE_UPDATE_MODE', 'PHP_EXECUTABLE', 'LOCK_DIRECTORY', 'CACHE_DIR', 'ICONS_DIR', 'ICONS_URL', 'AUTH_AUTO_CREATE', 'AUTH_AUTO_LOGIN', 'FORCE_ARTICLE_PURGE', 'PUBSUBHUBBUB_HUB', 'PUBSUBHUBBUB_ENABLED', 'SPHINX_ENABLED', 'SPHINX_INDEX', 'ENABLE_REGISTRATION', 'REG_NOTIFY_ADDRESS', 'REG_MAX_USERS', 'SESSION_COOKIE_LIFETIME', 'SESSION_EXPIRE_TIME', 'SESSION_CHECK_ADDRESS', 'SMTP_FROM_NAME', 'SMTP_FROM_ADDRESS', 'DIGEST_SUBJECT', 'SMTP_HOST', 'SMTP_LOGIN', 'SMTP_PASSWORD', 'CHECK_FOR_NEW_VERSION', 'ENABLE_GZIP_OUTPUT', 'PLUGINS', 'FEEDBACK_URL', 'CONFIG_VERSION'); ?>