encoding, fix: Normalize UTF8 and UTF_8 to utf8, to please iconv.

Signed-off-by: William Morgan <wmorgan-sup@masanjin.net>

diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 01008ede4a9c6582535db3d69fd33e262fa5517a..53ab2a670752c14bbfaa703b72464db576ff164d 100644 (file)
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -391,6 +391,7 @@ private
   end
 
   def self.convert_from body, charset
+    charset = "utf-8" if charset =~ /UTF_?8/i
     begin
       raise MessageFormatError, "RubyMail decode returned a null body" unless body
       return body unless charset

diff --git a/lib/sup/rfc2047.rb b/lib/sup/rfc2047.rb
index 10ad7e065352ced65a6c19399db635cea9934be2..947de022bc41715c641585e7fe73b4405aac7b6e 100644 (file)
--- a/lib/sup/rfc2047.rb
+++ b/lib/sup/rfc2047.rb
@@ -52,6 +52,8 @@ module Rfc2047
         # WORD.
       end
 
+      charset = "utf-8" if charset =~ /UTF_?8/i
+
       # Convert:
       #
       # Remember - Iconv.open(to, from)!