msgiter: attempt to decode all text/* bodies

[public-inbox.git] / lib / PublicInbox / MsgIter.pm

diff --git a/lib/PublicInbox/MsgIter.pm b/lib/PublicInbox/MsgIter.pm
index f11ba223c93362a985285555e4113feab87684f1..d9df32abc37c7fc7da68c0e09ed2f942ddbb4827 100644 (file)
--- a/lib/PublicInbox/MsgIter.pm
+++ b/lib/PublicInbox/MsgIter.pm
@@ -45,12 +45,18 @@ sub msg_part_text ($$) {
        # times when it should not have been:
        #   <87llgalspt.fsf@free.fr>
        #   <200308111450.h7BEoOu20077@mail.osdl.org>
-       if ($err && ($ct =~ m!\btext/plain\b!i ||
+       if ($err && ($ct =~ m!\btext/\b!i ||
                        $ct =~ m!\bmultipart/mixed\b!i)) {
-               # Try to assume UTF-8 because Alpine seems to
-               # do wacky things and set charset=X-UNKNOWN
-               $part->charset_set('UTF-8');
-               $s = eval { $part->body_str };
+               my $cte = $part->header_raw('Content-Transfer-Encoding');
+               if (defined($cte) && $cte =~ /\b7bit\b/i) {
+                       $s = $part->body;
+                       $err = undef if $s =~ /\A[[:ascii:]]+\z/s;
+               } else {
+                       # Try to assume UTF-8 because Alpine seems to
+                       # do wacky things and set charset=X-UNKNOWN
+                       $part->charset_set('UTF-8');
+                       $s = eval { $part->body_str };
+               }
 
                # If forcing charset=UTF-8 failed,
                # caller will warn further down...