From d857e7dc0d816b635a7ead09c3273f8c2d2434be Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 25 Feb 2020 09:23:03 +0000 Subject: [PATCH] msgtime: assume +0000 if TZ missing when using Date::Parse Some old emails don't have timezone offsets, since our Date::Parse code path takes a liberal interpretation of dates, fallback to using "+0000" as the timezone offset since it's closer to the actual date of the message than whatever the current date is. Reported-by: Leah Neukirchen Link: https://public-inbox.org/meta/87h7zfemur.fsf@vuxu.org/ Fixes: ae80a3fdb53d7014 ("MsgTime.pm: Use strptime to compute the time zone") --- lib/PublicInbox/MsgTime.pm | 3 ++- t/msgtime.t | 7 +++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/lib/PublicInbox/MsgTime.pm b/lib/PublicInbox/MsgTime.pm index 8eee9a75..8703d7bc 100644 --- a/lib/PublicInbox/MsgTime.pm +++ b/lib/PublicInbox/MsgTime.pm @@ -104,7 +104,8 @@ sub str2date_zone ($) { # off is the time zone offset in seconds from GMT my ($ss,$mm,$hh,$day,$month,$year,$off) = Date::Parse::strptime($date); - return undef unless(defined $off); + return unless defined($year); + $off //= 0; # Compute the time zone from offset my $sign = ($off < 0) ? '-' : '+'; diff --git a/t/msgtime.t b/t/msgtime.t index 5c4636a2..7c95e547 100644 --- a/t/msgtime.t +++ b/t/msgtime.t @@ -5,6 +5,8 @@ use warnings; use Test::More; use PublicInbox::MIME; use PublicInbox::MsgTime; +use PublicInbox::TestCommon; + our $received_date = 'Mon, 22 Jan 2007 13:16:24 -0500'; sub datestamp ($) { my ($date) = @_; @@ -102,6 +104,11 @@ is_datestamp('Thu, 14 Dec 2006 00:20:24 +0480', [1166036424, '+0520']); is_datestamp('Thu, 14 Dec 2006 00:20:24 -0480', [1166074824, '-0520']); is_datestamp('Mon, 14 Apr 2014 07:59:01 -0007', [1397462761, '-0007']); +SKIP: { + require_mods('Date::Parse', 1); + is_datestamp('Sat, 27 Sep 1997 10:02:32', [875354552, '+0000']); +} + # obsolete formats described in RFC2822 for (qw(UT GMT Z)) { is_datestamp('Fri, 02 Oct 1993 00:00:00 '.$_, [ 749520000, '+0000']); -- 2.44.0