From d5d21d20d7e8ff41e9a445544a2e4ccb7b3fd114 Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Mon, 26 Jan 2015 21:31:47 +0900
Subject: [PATCH] Support HTTP date ending "+0000" as well as "GMT".

---
 src/TimeA2.cc    | 6 ++++++
 src/TimeA2.h     | 4 ++++
 test/TimeTest.cc | 7 +++++++
 3 files changed, 17 insertions(+)

diff --git a/src/TimeA2.cc b/src/TimeA2.cc
index 89ec0278..8e60cf20 100644
--- a/src/TimeA2.cc
+++ b/src/TimeA2.cc
@@ -203,6 +203,11 @@ Time Time::parseRFC1123(const std::string& datetime)
   return parse(datetime, "%a, %d %b %Y %H:%M:%S GMT");
 }
 
+Time Time::parseRFC1123Alt(const std::string& datetime)
+{
+  return parse(datetime, "%a, %d %b %Y %H:%M:%S +0000");
+}
+
 Time Time::parseRFC850(const std::string& datetime)
 {
   return parse(datetime, "%a, %d-%b-%y %H:%M:%S GMT");
@@ -222,6 +227,7 @@ Time Time::parseHTTPDate(const std::string& datetime)
 {
   Time (*funcs[])(const std::string&) = {
     &parseRFC1123,
+    &parseRFC1123Alt,
     &parseRFC850,
     &parseAsctime,
     &parseRFC850Ext,
diff --git a/src/TimeA2.h b/src/TimeA2.h
index 97302a55..fa0c70cd 100644
--- a/src/TimeA2.h
+++ b/src/TimeA2.h
@@ -120,6 +120,10 @@ public:
   // Currently timezone is assumed to GMT.
   static Time parseRFC1123(const std::string& datetime);
 
+  // Like parseRFC1123, but only accepts trailing "+0000" instead of
+  // last 3 letters "GMT".
+  static Time parseRFC1123Alt(const std::string& datetime);
+
   // Currently timezone is assumed to GMT.
   static Time parseRFC850(const std::string& datetime);
 
diff --git a/test/TimeTest.cc b/test/TimeTest.cc
index 048b5a1b..ceea6594 100644
--- a/test/TimeTest.cc
+++ b/test/TimeTest.cc
@@ -27,6 +27,7 @@ public:
   void tearDown() {}
 
   void testParseRFC1123();
+  void testParseRFC1123Alt();
   void testParseRFC850();
   void testParseRFC850Ext();
   void testParseAsctime();
@@ -45,6 +46,12 @@ void TimeTest::testParseRFC1123()
   CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTime());
 }
 
+void TimeTest::testParseRFC1123Alt()
+{
+  Time t1 = Time::parseRFC1123Alt("Sat, 06 Sep 2008 15:26:33 +0000");
+  CPPUNIT_ASSERT_EQUAL((time_t)1220714793, t1.getTime());
+}
+
 void TimeTest::testParseRFC850()
 {
   Time t1 = Time::parseRFC850("Saturday, 06-Sep-08 15:26:33 GMT");