expires is a valid cookie name

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

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/Mojo/Util.pm b/lib/Mojo/Util.pm
@@ -388,7 +388,7 @@ sub _header {
   my (@tree, @token);
   while ($str =~ s/^[,;\s]*([^=;, ]+)\s*//) {
     push @token, $1, undef;
-    my $expires = $cookie && lc $1 eq 'expires';
+    my $expires = $cookie && @token > 2 && lc $1 eq 'expires';
 
     # Special "expires" value
     if ($expires && $str =~ s/^=\s*$EXPIRES_RE//o) { $token[-1] = $1 }

diff --git a/t/mojo/util.t b/t/mojo/util.t
@@ -106,6 +106,13 @@ 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';
+$header = 'expires=Thu, 07 Aug 2008 07:07:59 GMT, a=b';
+$tree   = [
+  ['expires', 'Thu'],
+  ['07', undef, 'Aug', undef, '2008', undef, '07:07:59', undef, 'GMT', undef],
+  ['a',  'b']
+];
+is_deeply split_cookie_header($header), $tree, 'right result';
 
 # unindent
 is unindent(" test\n  123\n 456\n"), "test\n 123\n456\n",