net/mail: accept UT as a timezone

Fixes #39906

Change-Id: I8fcaf4c1ccc4131d770cff08d9c80f520885a6b5
Reviewed-on: https://go-review.googlesource.com/c/go/+/396214
Trust: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gopher Robot <gobot@golang.org>
Reviewed-by: Emmanuel Odeke <emmanuel@orijtech.com>

diff --git a/src/net/mail/message.go b/src/net/mail/message.go
index 5770e3d8dc6db52ccc701a2724ed977d03bb22ae..61a3a26b012a41c57fb37f6f81bef400e5dc1fed 100644 (file)
--- a/src/net/mail/message.go
+++ b/src/net/mail/message.go
@@ -79,7 +79,7 @@ func buildDateLayouts() {
        years := [...]string{"2006", "06"} // year = 4*DIGIT / 2*DIGIT
        seconds := [...]string{":05", ""}  // second
        // "-0700 (MST)" is not in RFC 5322, but is common.
-       zones := [...]string{"-0700", "MST"} // zone = (("+" / "-") 4DIGIT) / "GMT" / ...
+       zones := [...]string{"-0700", "MST", "UT"} // zone = (("+" / "-") 4DIGIT) / "UT" / "GMT" / ...
 
        for _, dow := range dows {
                for _, day := range days {

diff --git a/src/net/mail/message_test.go b/src/net/mail/message_test.go
index 41c54b868777049d539575ca4860063360277b92..61e50ccfd5c8447816b73d74aede200703b201b1 100644 (file)
--- a/src/net/mail/message_test.go
+++ b/src/net/mail/message_test.go
@@ -265,11 +265,21 @@ func TestDateParsingCFWS(t *testing.T) {
                {
                        "Tue, 26 May 2020 14:04:40 UT",
                        time.Date(2020, 05, 26, 14, 04, 40, 0, time.UTC),
-                       false,
+                       true,
                },
                {
                        "Thu, 21 May 2020 14:04:40 UT",
                        time.Date(2020, 05, 21, 14, 04, 40, 0, time.UTC),
+                       true,
+               },
+               {
+                       "Tue, 26 May 2020 14:04:40 XT",
+                       time.Date(2020, 05, 26, 14, 04, 40, 0, time.UTC),
+                       false,
+               },
+               {
+                       "Thu, 21 May 2020 14:04:40 XT",
+                       time.Date(2020, 05, 21, 14, 04, 40, 0, time.UTC),
                        false,
                },
                {