From cd68aa719ccdd58baedf16a08d2e54cff493ee58 Mon Sep 17 00:00:00 2001
From: Christian Mehlmauer <firefart@gmail.com>
Date: Fri, 1 Apr 2016 11:52:13 +0200
Subject: [PATCH] possible fix for timeouts

---
 lib/common/browser.rb    | 4 ++--
 lib/common/db_updater.rb | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/lib/common/browser.rb b/lib/common/browser.rb
index 34a17583..8ee29300 100644
--- a/lib/common/browser.rb
+++ b/lib/common/browser.rb
@@ -143,8 +143,8 @@ class Browser
     end
 
     params.merge!(referer: referer)
-    params.merge!(timeout: @request_timeout) if @request_timeout
-    params.merge!(connecttimeout: @connect_timeout) if @connect_timeout
+    params.merge!(timeout: @request_timeout) if @request_timeout && !params.key?(:timeout)
+    params.merge!(connecttimeout: @connect_timeout) if @connect_timeout && !params.key?(:connecttimeout)
 
     # Used to enable the cache system if :cache_ttl > 0
     params.merge!(cache_ttl: @cache_ttl) unless params.key?(:cache_ttl)
diff --git a/lib/common/db_updater.rb b/lib/common/db_updater.rb
index 4515bae4..ed8f6a9d 100644
--- a/lib/common/db_updater.rb
+++ b/lib/common/db_updater.rb
@@ -22,7 +22,9 @@ class DbUpdater
     {
       ssl_verifyhost: 2,
       ssl_verifypeer: true,
-      accept_encoding: 'gzip, deflate'
+      accept_encoding: 'gzip, deflate',
+      timeout: 120,
+      connecttimeout: 20
     }
   end