use strict;
use warnings;
use base qw/Exporter/;
-our @EXPORT_OK = qw/mid_clean mid_compressed mid2path/;
+our @EXPORT_OK = qw/mid_clean mid_compress mid2path/;
use Digest::SHA qw/sha1_hex/;
use constant MID_MAX => 40; # SHA-1 hex length
my ($mid) = @_;
defined($mid) or die "no Message-ID";
# MDA->precheck did more checking for us
- $mid =~ s/\A\s*<?//;
- $mid =~ s/>?\s*\z//;
+ if ($mid =~ /<([^>]+)>/) {
+ $mid = $1;
+ }
$mid;
}
# this is idempotent
-sub mid_compressed {
- my ($mid) = @_;
+sub mid_compress {
+ my ($mid, $force) = @_;
# XXX dirty hack! FIXME!
# Some HTTP servers (apache2 2.2.22-13+deb7u5 on my system)
# or what; will need to debug...
return sha1_hex($mid) if (index($mid, '%') >= 0);
- return $mid if (length($mid) <= MID_MAX);
+ return $mid if (!$force && length($mid) <= MID_MAX);
sha1_hex($mid);
}
unless (defined $x38) {
# compatibility with old links (or short Message-IDs :)
- $mid = sha1_hex($mid);
+ $mid = sha1_hex(mid_clean($mid));
($x2, $x38) = ($mid =~ /\A([a-f0-9]{2})([a-f0-9]{38})\z/);
}
"$x2/$x38";