diff options
Diffstat (limited to 'lib/PublicInbox/MID.pm')
| -rw-r--r-- | lib/PublicInbox/MID.pm | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/PublicInbox/MID.pm b/lib/PublicInbox/MID.pm index 35b517e0..36c05855 100644 --- a/lib/PublicInbox/MID.pm +++ b/lib/PublicInbox/MID.pm @@ -1,15 +1,15 @@ -# Copyright (C) 2015-2021 all contributors <meta@public-inbox.org> +# Copyright (C) all contributors <meta@public-inbox.org> # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt> # # Various Message-ID-related functions. package PublicInbox::MID; use strict; -use warnings; -use base qw/Exporter/; +use v5.10.1; # TODO: check unicode_strings compat for v5.12 +use parent qw(Exporter); our @EXPORT_OK = qw(mid_clean id_compress mid2path mid_escape MID_ESC mids references mids_for_index mids_in $MID_EXTRACT); use URI::Escape qw(uri_escape_utf8); -use Digest::SHA qw/sha1_hex/; +use PublicInbox::SHA qw(sha1_hex); require PublicInbox::Address; use constant { ID_MAX => 40, # SHA-1 hex length for HTML id anchors @@ -92,8 +92,7 @@ sub references ($) { my ($hdr) = @_; my @mids; foreach my $f (qw(References In-Reply-To)) { - my @v = $hdr->header_raw($f); - foreach my $v (@v) { + for my $v ($hdr->header_raw($f)) { push(@mids, ($v =~ /$MID_EXTRACT/g)); } } @@ -104,8 +103,7 @@ sub references ($) { my %addr = ( y => 1, n => 1 ); foreach my $f (qw(To From Cc)) { - my @v = $hdr->header_raw($f); - foreach my $v (@v) { + for my $v ($hdr->header_raw($f)) { $addr{$_} = 1 for (PublicInbox::Address::emails($v)); } } @@ -117,7 +115,7 @@ sub uniq_mids ($;$) { my @ret; $seen ||= {}; foreach my $mid (@$mids) { - $mid =~ tr/\n\t\r//d; + $mid =~ tr/\n\t\r\0//d; if (length($mid) > MAX_MID_SIZE) { warn "Message-ID: <$mid> too long, truncating\n"; $mid = substr($mid, 0, MAX_MID_SIZE); @@ -127,7 +125,7 @@ sub uniq_mids ($;$) { \@ret; } -# RFC3986, section 3.3: +# RFC3986, section 3.3 (pathnames only): sub MID_ESC () { '^A-Za-z0-9\-\._~!\$\&\'\(\)\*\+,;=:@' } sub mid_escape ($) { uri_escape_utf8($_[0], MID_ESC) } |