From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-2.9 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=unavailable version=3.3.2 X-Original-To: meta@public-inbox.org Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 67ED91F6F9 for ; Thu, 10 Sep 2015 00:59:08 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH] constent X?HTML MIME type filtering Date: Thu, 10 Sep 2015 00:59:08 +0000 Message-Id: <20150910005908.30372-1-e@80x24.org> List-Id: Filter and View should reject X?HTML the same way. --- lib/PublicInbox/Filter.pm | 2 +- lib/PublicInbox/View.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/PublicInbox/Filter.pm b/lib/PublicInbox/Filter.pm index 5a023cf..84df0e7 100644 --- 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 5baca97..9f87546 100644 --- 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 ''; } -- EW