Merge branch 'release/0.11' into rails-3-develop

2 files changed, 31 insertions, 3 deletions

diff --git a/lib/mail_handler/backends/mail_backend.rb b/lib/mail_handler/backends/mail_backend.rb
index 03d78e0a3..561946980 100644
--- a/lib/mail_handler/backends/mail_backend.rb
+++ b/lib/mail_handler/backends/mail_backend.rb
@@ -367,7 +367,9 @@ module MailHandler
             end
 
             def address_from_string(string)
-                Mail::Address.new(string).address
+                mail = Mail.new
+                mail.from = string
+                mail.from[0]
             end
         end
     end
diff --git a/lib/mail_handler/backends/mail_extensions.rb b/lib/mail_handler/backends/mail_extensions.rb
index d25012e39..322c49bb5 100644
--- a/lib/mail_handler/backends/mail_extensions.rb
+++ b/lib/mail_handler/backends/mail_extensions.rb
@@ -73,7 +73,12 @@ module Mail
             if match
                 encoding = match[1]
                 str = Ruby18.decode_base64(match[2])
-                str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str)
+                # Adding and removing trailing spaces is a workaround
+                # for Iconv.conv throwing an exception if it finds an
+                # invalid character at the end of the string, even
+                # with UTF-8//IGNORE:
+                # http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
+                str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str + "    ")[0...-4]
             end
             str
         end
@@ -86,7 +91,12 @@ module Mail
               # Remove trailing = if it exists in a Q encoding
               string = string.sub(/\=$/, '')
               str = Encodings::QuotedPrintable.decode(string)
-              str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str)
+              # Adding and removing trailing spaces is a workaround
+              # for Iconv.conv throwing an exception if it finds an
+              # invalid character at the end of the string, even
+              # with UTF-8//IGNORE:
+              # http://po-ru.com/diary/fixing-invalid-utf-8-in-ruby-revisited/
+              str = Iconv.conv('UTF-8//IGNORE', fix_encoding(encoding), str + "    ")[0...-4]
           end
           str
         end
@@ -102,4 +112,20 @@ module Mail
             end
         end
     end
+    class Ruby19
+
+        def Ruby19.q_value_decode(str)
+            match = str.match(/\=\?(.+)?\?[Qq]\?(.+)?\?\=/m)
+            if match
+                encoding = match[1]
+                str = Encodings::QuotedPrintable.decode(match[2].gsub(/_/, '=20'))
+                # Backport line from mail 2.5 to strip a trailing = character
+                # Remove trailing = if it exists in a Q encoding
+                str = str.sub(/\=$/, '')
+                str.force_encoding(fix_encoding(encoding))
+            end
+            decoded = str.encode("utf-8", :invalid => :replace, :replace => "")
+            decoded.valid_encoding? ? decoded : decoded.encode("utf-16le", :invalid => :replace, :replace => "").encode("utf-8")
+        end
+    end
 end