From 29d6d15fc3dcb0d1c0ba531c5de7a8ea025f4ceb Mon Sep 17 00:00:00 2001 From: Jamis Buck Date: Wed, 8 Jun 2005 10:18:26 +0000 Subject: Silently ignore Errno::EINVAL errors when converting between charsets. Some mail clients apprently send X-UNKNOWN to represent unknown charsets, and this caused the conversion to blow up. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1395 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionmailer/lib/action_mailer/vendor/tmail/quoting.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'actionmailer/lib') diff --git a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb index 4420f2ea6b..b593efafcd 100644 --- a/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb +++ b/actionmailer/lib/action_mailer/vendor/tmail/quoting.rb @@ -79,10 +79,13 @@ module TMail def convert_to(text, to, from) return text unless to && from text ? Iconv.iconv(to, from, text).first : "" - rescue Iconv::IllegalSequence + rescue Iconv::IllegalSequence, Errno::EINVAL # the 'from' parameter specifies a charset other than what the text # actually is...not much we can do in this case but just return the # unconverted text. + # + # Ditto if either parameter represents an unknown charset, like + # X-UNKNOWN. text end rescue LoadError -- cgit v1.2.3