diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-05-16 10:19:48 +0100 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-05-16 10:19:48 +0100 |
| commit | ea6fb578bfcdf9b6733f00df4b0ebca3963f7117 (patch) | |
| tree | 2d905ff5709ebe9b3b8c96699b0bd9ba8289f629 /lib/mail_handler/mail_handler.rb | |
| parent | f7e42400df70a16e4b6a22029055e944013ba64c (diff) | |
| parent | 27b3baf837ef3b3998a1a0ab7db053f92615dee5 (diff) | |
Merge branch 'external-command-memory-limit' into hotfix/0.9.0.3
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) |