reduce http timeout

git-svn-id: svn+ssh://svn.gna.org/svn/feed2imap/trunk/feed2imap@131 f70e237a-67f3-0310-a06c-d2b8a7116972

2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index e254402..8987262 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,9 +3,10 @@ Feed2Imap 0.9.2 (XX/10/2007)
 * resynchronized rubyimap.rb with stdlib. Might fix Debian bug #405070.
 * upload items in reverse order, to upload the older first
   Closes Gna bug #8986. Thanks go do Rial Juan for the patch.
-* Don't allow more than 8 fetchers to run at the same time.
-  8 should be a reasonable default for everybody.
+* Don't allow more than 16 fetchers to run at the same time.
+  16 should be a reasonable default for everybody.
   Closes Gna #9032.
+* Reduce the default HTTP timeout to 30s.
 
 Feed2Imap 0.9.1 (15/05/2007)
 ============================
diff --git a/lib/feed2imap/httpfetcher.rb b/lib/feed2imap/httpfetcher.rb
index aab2d4e..2438994 100644
--- a/lib/feed2imap/httpfetcher.rb
+++ b/lib/feed2imap/httpfetcher.rb
@@ -49,6 +49,8 @@ class HTTPFetcher
                             proxy_port,
                             proxy_user,
                             proxy_pass ).new(uri.host, uri.port)
+    http.read_timeout = 30 # should be enough for everybody...
+    http.open_timeout = 30
     if uri.scheme == 'https'
       http.use_ssl = true 
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE