From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 24 Apr 2013 10:04:23 +0000 (+0400)
Subject: Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
X-Git-Tag: 1.7.9~25^2~99
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=6c0d41c644a77198d5b1c91dd63cc687779f4cf4;p=tt-rss.git

Merge branch 'master' of github.com:gothfox/Tiny-Tiny-RSS
---

6c0d41c644a77198d5b1c91dd63cc687779f4cf4
diff --cc update_daemon2.php
index 51fe8cfe,f841954c..30787e6a
--- a/update_daemon2.php
+++ b/update_daemon2.php
@@@ -15,10 -15,9 +15,9 @@@
  
  	// defaults
  	define_default('PURGE_INTERVAL', 3600); // seconds
 -	define_default('MAX_CHILD_RUNTIME', 600); // seconds
 +	define_default('MAX_CHILD_RUNTIME', 1800); // seconds
  	define_default('MAX_JOBS', 2);
  	define_default('SPAWN_INTERVAL', DAEMON_SLEEP_INTERVAL); // seconds
- 	define_default('DAEMON_FEED_LIMIT', 250);
  
  	require_once "rssfuncs.php";
  	require_once "sanity_check.php";