constent X?HTML MIME type filtering

Filter and View should reject X?HTML the same way.

diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm
index 5a023cf7032b0e27573932238c6349b1464f5004..84df0e7d64669245b68584dd625023aef61fc326 100644 (file)
--- a/lib/PublicInbox/Filter.pm
+++ b/lib/PublicInbox/Filter.pm
@@ -16,7 +16,7 @@ use constant NO_HTML => '*** We only accept plain-text email, no HTML ***';
 
 # start with the same defaults as mailman
 our $BAD_EXT = qr/\.(exe|bat|cmd|com|pif|scr|vbs|cpl|zip)\s*\z/i;
-our $MIME_HTML = qr!\btext/html\b!i;
+our $MIME_HTML = qr!\btext/x?html\b!i;
 our $MIME_TEXT_ANY = qr!\btext/[a-z0-9\+\._-]+\b!i;
 
 # this is highly opinionated delivery

diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index 5baca972d91eefcc16f647bbb35fa72aef856cfc..9f87546f9428b680ad90768419700f1f62f70755 100644 (file)
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -353,7 +353,7 @@ sub add_text_body {
 
        my $ct = $part->content_type;
        # account for filter bugs...
-       if (defined $ct && $ct =~ m!\btext/[xh]+tml\b!i) {
+       if (defined $ct && $ct =~ m!\btext/x?html\b!i) {
                $part->body_set('');
                return '';
        }