Merge branch 'master' into don/libravatar

[debbugs.git] / Debbugs / MIME.pm

diff --git a/Debbugs/MIME.pm b/Debbugs/MIME.pm
index 3719d2e23f304f6659a33825aab6a3051b873ffe..15078f2c18929f535e8ff83da7958c053f7e522a 100644 (file)
--- a/Debbugs/MIME.pm
+++ b/Debbugs/MIME.pm
@@ -10,6 +10,8 @@
 
 package Debbugs::MIME;
 
+=encoding utf8
+
 =head1 NAME
 
 Debbugs::MIME -- Mime handling routines for debbugs
@@ -115,6 +117,9 @@ sub parse
        my @msg = split /\n/, $_[0];
        my $i;
 
+        # assume us-ascii unless charset is set; probably bad, but we
+        # really shouldn't get to this point anyway
+        my $charset = 'us-ascii';
        for ($i = 0; $i <= $#msg; ++$i) {
            $_ = $msg[$i];
            last unless length;
@@ -122,10 +127,12 @@ sub parse
                ++$i;
                $_ .= "\n" . $msg[$i];
            }
+            if (/charset=\"([^\"]+)\"/) {
+                $charset = $1;
+            }
            push @headerlines, $_;
        }
-
-       @bodylines = @msg[$i .. $#msg];
+       @bodylines = map {convert_to_utf8($_,$charset)} @msg[$i .. $#msg];
     }
 
     rmtree $tempdir, 0, 1;