diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-05-16 10:39:01 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-05-16 10:39:01 +0100 |
| commit | babc902288a0f20c9eae3377e3a1168bdd1513cd (patch) | |
| tree | d8e04a23fb7bb2c55ecb4bead830ae7c47b32f8d /lib/mail_handler/mail_handler.rb | |
| parent | 2fbaa3a0f8880ef24e0c1a35641f56f0ca6e9b67 (diff) | |
| parent | ea6fb578bfcdf9b6733f00df4b0ebca3963f7117 (diff) | |
Merge branch 'hotfix/0.9.0.3' into wdtk
Diffstat (limited to 'lib/mail_handler/mail_handler.rb')
| -rw-r--r-- | lib/mail_handler/mail_handler.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/mail_handler/mail_handler.rb b/lib/mail_handler/mail_handler.rb index 8b227b9ca..cd5abfab7 100644 --- a/lib/mail_handler/mail_handler.rb +++ b/lib/mail_handler/mail_handler.rb @@ -84,7 +84,8 @@ module MailHandler tempfile.flush default_params = { :append_to => text, :binary_output => false } if content_type == 'application/vnd.ms-word' - AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt") + AlaveteliExternalCommand.run("wvText", tempfile.path, tempfile.path + ".txt", + { :memory_limit => 536870912 } ) # 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) |