diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-09-04 11:26:01 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-09-04 11:26:01 +0100 |
| commit | bb5894cbc39a1c9258e274fb9e3a15eaa44ab1c6 (patch) | |
| tree | fd582f473f68515b6fbb99d52897adac1c4bdeb3 | |
| parent | 1acc6d4d9cd8a4b6173ee19df847db6088da8e99 (diff) | |
| parent | 40bfb44da55f134e3525c48d5b98c7f096f01061 (diff) | |
Merge branch 'hotfix/0.13.0.2' into rails-3-develop
| -rw-r--r-- | lib/mail_handler/mail_handler.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb index 9c955cccd..918f91180 100644 --- a/lib/mail_handler/mail_handler.rb +++ b/lib/mail_handler/mail_handler.rb @@ -81,7 +81,7 @@ module MailHandler default_params = { :append_to => text, :binary_output => false } if content_type == 'application/vnd.ms-word' AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt", - { :memory_limit => 536870912 } ) + { :memory_limit => 536870912, :timeout => 120 } ) # Try catdoc if we get into trouble (e.g. for InfoRequestEvent 2701) if not File.exists?(tempfile.path + ".txt") AlaveteliExternalCommand.run("catdoc", tempfile.path, default_params) |