Merge branch 'master' into tunable-fetches

Conflicts:
	include/rssfuncs.php

1 files changed, 21 insertions, 0 deletions

diff --git a/config.php-dist b/config.php-dist
index 6561ecbd4..72320bc5f 100644
--- a/config.php-dist
+++ b/config.php-dist
@@ -163,6 +163,27 @@
 	// These two options enable SMTP authentication when sending
 	// outgoing mail. Only used with SMTP_HOST
 
+	// **************************************
+	// *** Update proces tuning settings  ***
+	// **************************************
+
+	define('FEED_FETCH_TIMEOUT', 45);
+	// How may seconds to wait for response when requesting feed from a site
+	// You may need to decease this if you see errors like "MySQL server
+	// has gone away" pop up in your feed update logs after fetching feeds
+	// from slow websites
+
+	define('FEED_FETCH_NO_CACHE_TIMEOUT', 15);
+	// How may seconds to wait for response when requesting feed from a
+	// site when that feed wasn't cached before
+
+	define('FILE_FETCH_TIMEOUT', 45);
+	// Default timeout when fetching files from remote sites
+
+	define('FILE_FETCH_CONNECT_TIMEOUT', 15);
+	// How many seconds to wait for initial response from website when
+	// fetching files from remote sites
+
 	// ***************************************
 	// *** Other settings (less important) ***
 	// ***************************************