handle a few more special cases

mojolicious · Feb 11, 2015 · 45226f6 · 45226f6
1 parent 1502135
commit 45226f6
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/lib/Mojo/Date.pm b/lib/Mojo/Date.pm
@@ -28,7 +28,7 @@ sub parse {
   # RFC 850/1036 (Sunday, 06-Nov-94 08:49:37 GMT)
   my $offset = 0;
   my ($day, $month, $year, $h, $m, $s);
-  if ($date =~ /^\w+\,\s*(\d+)\W+(\w+)\D+(\d+)\s+(\d+):(\d+):(\d+)\s+\w+$/) {
+  if ($date =~ /^\w+\W+(\d+)\W+(\w+)\D+(\d+)\W+(\d+):(\d+):(\d+)\W*\w+$/) {
     ($day, $month, $year, $h, $m, $s) = ($1, $MONTHS{$2}, $3, $4, $5, $6);
   }
 

diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -49,7 +49,7 @@ my %XML = (
 );
 
 # "Sun, 06 Nov 1994 08:49:37 GMT" and "Sunday, 06-Nov-94 08:49:37 GMT"
-my $EXPIRES_RE = qr/(\w+\,\s*\d+\W+\w+\D+\d+\s+\d+:\d+:\d+\s+\w+)/;
+my $EXPIRES_RE = qr/(\w+\W+\d+\W+\w+\D+\d+\W+\d+:\d+:\d+\W*\w+)/;
 
 # Encoding cache
 my %CACHE;

diff --git a/t/mojo/date.t b/t/mojo/date.t
@@ -44,6 +44,8 @@ is(Mojo::Date->new('Sun,  06-Nov-1994  08:49:37  UTC')->epoch,
   784111777, 'right epoch value');
 is(Mojo::Date->new('Sunday,06  Nov  94  08:49:37  UTC')->epoch,
   784111777, 'right epoch value');
+is(Mojo::Date->new('Sunday 06 Nov 94 08:49:37UTC')->epoch,
+  784111777, 'right epoch value');
 is(Mojo::Date->new('2014-08-20  20:45:00')->epoch,
   1408567500, 'right epoch value');
 

diff --git a/t/mojo/util.t b/t/mojo/util.t
@@ -102,6 +102,10 @@ is_deeply split_cookie_header(
   'a=b; expires=Sun,06  Nov  1994  08:49:37  UTC; path=/'),
   [['a', 'b', 'expires', 'Sun,06  Nov  1994  08:49:37  UTC', 'path', '/']],
   'right result';
+is_deeply split_cookie_header(
+  'a=b; expires=Sunday 06 Nov 94 08:49:37UTC; path=/'),
+  [['a', 'b', 'expires', 'Sunday 06 Nov 94 08:49:37UTC', 'path', '/']],
+  'right result';
 
 # unindent
 is unindent(" test\n  123\n 456\n"), "test\n 123\n456\n",