X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=Debbugs%2FMIME.pm;h=3719d2e23f304f6659a33825aab6a3051b873ffe;hb=1b96ee16e68b3978c752257ace938f3021670ed8;hp=482a30b4d182e530bbcd3b780a5479dc53f4cae4;hpb=9dd18b2a38fae81a660504da29147937596ba206;p=debbugs.git

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index 482a30b..3719d2e 100644
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -57,11 +57,8 @@ use List::MoreUtils qw(apply);
 # for convert_to_utf8
 use Debbugs::UTF8 qw(convert_to_utf8);
 
-# for decode_rfc1522
-use MIME::WordDecoder qw();
+# for decode_rfc1522 and encode_rfc1522
 use Encode qw(decode encode encode_utf8 decode_utf8 is_utf8);
-
-# for encode_rfc1522
 use MIME::Words qw();
 
 sub getmailbody
@@ -202,8 +199,8 @@ sub create_mime_message{
      # MIME::Entity is stupid, and doesn't rfc1522 encode its headers, so we do it for it.
      my $msg = MIME::Entity->build('Content-Type' => 'text/plain; charset=utf-8',
 				   'Encoding'     => 'quoted-printable',
-				   (map{encode_rfc1522($_)} @{$headers}),
-				   Data    => is_utf8($body)?encode_utf8($body):$body,
+				   (map{encode_rfc1522(encode_utf8($_))} @{$headers}),
+				   Data    => encode_utf8($body),
 				  );
 
      # Attach the attachments
@@ -248,24 +245,27 @@ Turn RFC-1522 names into the UTF-8 equivalent.
 
 =cut
 
-BEGIN {
-    # Set up the default RFC1522 decoder, which turns all charsets that
-    # are supported into the appropriate UTF-8 charset.
-    MIME::WordDecoder->default(new MIME::WordDecoder(
-	['*' => \&convert_to_utf8,
-	]));
-}
-
 sub decode_rfc1522 {
     my ($string) = @_;
 
     # this is craptacular, but leading space is hacked off by unmime.
     # Save it.
     my $leading_space = '';
-    $leading_space = $1 if $string =~ s/^(\s+)//;
-    # unmime calls the default MIME::WordDecoder handler set up at
-    # initialization time.
-    return $leading_space . MIME::WordDecoder::unmime($string);
+    $leading_space = $1 if $string =~ s/^(\ +)//;
+    # we must do this to switch off the utf8 flag before calling decode_mimewords
+    $string = encode_utf8($string);
+    my @mime_words = MIME::Words::decode_mimewords($string);
+    my $tmp = $leading_space .
+        join('',
+             (map {
+                 if (@{$_} > 1) {
+                     convert_to_utf8(${$_}[0],${$_}[1]);
+                 } else {
+                     decode_utf8(${$_}[0]);
+                 }
+             } @mime_words)
+            );
+    return $tmp;
 }
 
 =head2 encode_rfc1522
@@ -285,9 +285,10 @@ sub encode_rfc1522 {
 
      # handle being passed undef properly
      return undef if not defined $rawstr;
-     if (is_utf8($rawstr)) {
-	 $rawstr= encode_utf8($rawstr);
-     }
+
+     # convert to octets if we are given a string in perl's internal
+     # encoding
+     $rawstr= encode_utf8($rawstr) if is_utf8($rawstr);
      # We process words in reverse so we can preserve spacing between
      # encoded words. This regex splits on word|nonword boundaries and
      # nonword|nonword boundaries. We also consider parenthesis and "