aboutsummaryrefslogtreecommitdiffstats
path: root/lib/mail_handler/mail_handler.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/mail_handler/mail_handler.rb')
-rw-r--r--lib/mail_handler/mail_handler.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb
index 47015f207..33d939e22 100644
--- a/lib/mail_handler/mail_handler.rb
+++ b/lib/mail_handler/mail_handler.rb
@@ -78,7 +78,9 @@ module MailHandler
tempfile.binmode
tempfile.print body
tempfile.flush
- default_params = { :append_to => text, :binary_output => false }
+ default_params = { :append_to => text,
+ :binary_output => false,
+ :timeout => 1200 }
if content_type == 'application/vnd.ms-word'
AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt",
{ :memory_limit => 536870912, :timeout => 120 } )