Merge remote-tracking branch 'origin/newspeak' into xcpdb

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

diff --git a/lib/PublicInbox/WwwAttach.pm b/lib/PublicInbox/WwwAttach.pm
index b1504f526725286b671074beadced88a9be996a9..96103cb028e09b014e4bf29fb7e711c4e567ec08 100644 (file)
--- a/lib/PublicInbox/WwwAttach.pm
+++ b/lib/PublicInbox/WwwAttach.pm
@@ -5,6 +5,7 @@
 package PublicInbox::WwwAttach; # internal package
 use strict;
 use warnings;
+use bytes (); # only for bytes::length
 use Email::MIME::ContentType qw(parse_content_type);
 use PublicInbox::MIME;
 use PublicInbox::MsgIter;
@@ -26,7 +27,7 @@ sub get_attach ($$$) {
                if ($ct && (($ct->{discrete} || '') eq 'text')) {
                        # display all text as text/plain:
                        my $cset = $ct->{attributes}->{charset};
-                       if ($cset && ($cset =~ /\A[\w-]+\z/)) {
+                       if ($cset && ($cset =~ /\A[a-zA-Z0-9_\-]+\z/)) {
                                $res->[1]->[1] .= qq(; charset=$cset);
                        }
                } else { # TODO: allow user to configure safe types