fix wxDateTime::ParseRfc822Date() to handle missing seconds (ticket #1341)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@53900 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/datetime.cpp b/src/common/datetime.cpp
index 7fdd2affd108420d9b06694565c81c4bed8eb03d..f6ad3f6259ab5fd94d548c220cdf7d9029b301f6 100644 (file)
--- a/src/common/datetime.cpp
+++ b/src/common/datetime.cpp
@@ -2847,8 +2847,9 @@ wxDateTime::ParseRfc822Date(const wxString& date, wxString::const_iterator *end)
     min = (wxDateTime_t)(min + *p++ - _T('0'));
 
     wxDateTime_t sec = 0;
     min = (wxDateTime_t)(min + *p++ - _T('0'));
 
     wxDateTime_t sec = 0;

-    if ( *p++ == _T(':') )
+    if ( *p == _T(':') )

     {
     {

+        p++;

         if ( !wxIsdigit(*p) )
         {
             return NULL;
         if ( !wxIsdigit(*p) )
         {
             return NULL;

diff --git a/tests/datetime/datetimetest.cpp b/tests/datetime/datetimetest.cpp
index 9fcbd29a25f5367ec5a77a4bb0f33b5f6153f697..cc15c73abc6b26edacde2b4f23409bd07bd91d27 100644 (file)
--- a/tests/datetime/datetimetest.cpp
+++ b/tests/datetime/datetimetest.cpp
@@ -767,15 +767,29 @@ void DateTimeTestCase::TestParceRFC822()
         },
         {
             "Sun, 28 Aug 2005 03:31:30 +0200",
         },
         {
             "Sun, 28 Aug 2005 03:31:30 +0200",

-            {  28, wxDateTime::Aug, 2005, 1, 31, 30 },
+            { 28, wxDateTime::Aug, 2005, 1, 31, 30 },

             true
         },
 
         {
             "Sat, 18 Dec 1999 10:48:30 -0500",
             true
         },
 
         {
             "Sat, 18 Dec 1999 10:48:30 -0500",

-            {  18, wxDateTime::Dec, 1999, 15, 48, 30 },
+            { 18, wxDateTime::Dec, 1999, 15, 48, 30 },

             true
         },
             true
         },

+
+        // seconds are optional according to the RFC
+        {
+            "Sun, 01 Jun 2008 16:30 +0200",
+            {  1, wxDateTime::Jun, 2008, 14, 30, 00 },
+            true
+        },
+
+        // try some bogus ones too
+        {
+            "Sun, 01 Jun 2008 16:30: +0200",
+            { 0 },
+            false
+        },

     };
 
     for ( unsigned n = 0; n < WXSIZEOF(parseTestDates); n++ )
     };
 
     for ( unsigned n = 0; n < WXSIZEOF(parseTestDates); n++ )