Skip to content
This repository
Browse code

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
David Heinemeier Hansson authored March 26, 2005
6  actionmailer/CHANGELOG
... ...
@@ -1,5 +1,11 @@
1 1
 *SVN*
2 2
 
  3
+* Fixed that if charset was found that the end of a mime part declaration TMail would throw an error #919 [lon@speedymac.com]
  4
+
  5
+* Fixed that TMail::Unquoter would fail to recognize quoting method if it was in lowercase #919 [lon@speedymac.com]
  6
+
  7
+* 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]
  8
+
3 9
 * Added rescue for missing iconv library and throws warnings if subject/body is called on a TMail object without it instead
4 10
 
5 11
 
2  actionmailer/lib/action_mailer/vendor/tmail/encode.rb
@@ -295,7 +295,7 @@ def scanadd( str, force = false )
295 295
         else
296 296
           raise 'TMail FATAL: encoder scan fail'
297 297
         end
298  
-        str = m.post_match
  298
+        (str = m.post_match) unless m.nil?
299 299
       end
300 300
 
301 301
       do_encode types, strs
2  actionmailer/lib/action_mailer/vendor/tmail/mail.rb
@@ -281,6 +281,8 @@ def parse_header( f )
281 281
         when /\AFrom (\S+)/
282 282
           unixfrom = $1
283 283
 
  284
+  		  when /^charset=.*/
  285
+				
284 286
         else
285 287
           raise SyntaxError, "wrong mail header: '#{line.inspect}'"
286 288
         end
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")
35 35
             from_charset = $1
36 36
             quoting_method = $2
37 37
             text = $3
38  
-            case quoting_method
  38
+            case quoting_method.upcase
39 39
               when "Q" then
40 40
                 unquote_quoted_printable_and_convert_to(text, from_charset, to_charset)
41 41
               when "B" then

0 notes on commit 87b1d38

Please sign in to comment.
Something went wrong with that request. Please try again.