Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed that if charset was found that the end of a mime part declarati…

…on TMail would throw an error #919 [lon@speedymac.com] Fixed that TMail::Unquoter would fail to recognize quoting method if it was in lowercase #919 [lon@speedymac.com] Fixed that TMail::Encoder would fail when it attempts to parse e-mail addresses which are encoded using something other than the messages encoding method #919 [lon@speedymac.com]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@997 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 87b1d3834f135390375f2fa06e9b2a22ade0b5cb 1 parent df7a4d4
@dhh dhh authored
View
6 actionmailer/CHANGELOG
@@ -1,5 +1,11 @@
*SVN*
+* Fixed that if charset was found that the end of a mime part declaration TMail would throw an error #919 [lon@speedymac.com]
+
+* Fixed that TMail::Unquoter would fail to recognize quoting method if it was in lowercase #919 [lon@speedymac.com]
+
+* Fixed that TMail::Encoder would fail when it attempts to parse e-mail addresses which are encoded using something other than the messages encoding method #919 [lon@speedymac.com]
+
* Added rescue for missing iconv library and throws warnings if subject/body is called on a TMail object without it instead
View
2  actionmailer/lib/action_mailer/vendor/tmail/encode.rb
@@ -295,7 +295,7 @@ def scanadd( str, force = false )
else
raise 'TMail FATAL: encoder scan fail'
end
- str = m.post_match
+ (str = m.post_match) unless m.nil?
end
do_encode types, strs
View
2  actionmailer/lib/action_mailer/vendor/tmail/mail.rb
@@ -281,6 +281,8 @@ def parse_header( f )
when /\AFrom (\S+)/
unixfrom = $1
+ when /^charset=.*/
+
else
raise SyntaxError, "wrong mail header: '#{line.inspect}'"
end
View
2  actionmailer/lib/action_mailer/vendor/tmail/quoting.rb
@@ -35,7 +35,7 @@ def unquote_and_convert_to(text, to_charset, from_charset = "iso-8859-1")
from_charset = $1
quoting_method = $2
text = $3
- case quoting_method
+ case quoting_method.upcase
when "Q" then
unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
when "B" then
Please sign in to comment.
Something went wrong with that request. Please try again.