fix another warning in Mojo::Cookie::Response

mojolicious · Nov 30, 2015 · 029683c · 029683c
1 parent c6d00ca
commit 029683c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/lib/Mojo/Cookie/Response.pm b/lib/Mojo/Cookie/Response.pm
@@ -19,7 +19,7 @@ sub parse {
 
     while (my ($name, $value) = splice @$pairs, 0, 2) {
       next unless $ATTRS{my $attr = lc $name};
-      $value =~ s/^\.// if $attr eq 'domain';
+      $value =~ s/^\.// if $attr eq 'domain' && defined $value;
       $value = Mojo::Date->new($value // '')->epoch if $attr eq 'expires';
       $value = 1 if $attr eq 'secure' || $attr eq 'httponly';
       $cookies[-1]{$attr eq 'max-age' ? 'max_age' : $attr} = $value;

diff --git a/t/mojo/cookie.t b/t/mojo/cookie.t
@@ -372,21 +372,26 @@ is $cookies->[0]->to_string,
   . ' path=/test; secure; Max-Age=60', 'right result';
 is $cookies->[1], undef, 'no more cookies';
 
-# Parse response cookie with broken Expires value
+# Parse response cookie with broken Expires and Domain values
 $cookies = Mojo::Cookie::Response->parse('foo="ba r"; Expires=Th');
 is $cookies->[0]->name,    'foo',  'right name';
 is $cookies->[0]->value,   'ba r', 'right value';
 is $cookies->[0]->expires, undef,  'no expires value';
+is $cookies->[0]->domain,  undef,  'no domain value';
 is $cookies->[1], undef, 'no more cookies';
-$cookies = Mojo::Cookie::Response->parse('foo="ba r"; Expires=Th; Path=/test');
+$cookies = Mojo::Cookie::Response->parse(
+  'foo="ba r"; Expires=Th; Domain=; Path=/test');
 is $cookies->[0]->name,    'foo',  'right name';
 is $cookies->[0]->value,   'ba r', 'right value';
 is $cookies->[0]->expires, undef,  'no expires value';
+is $cookies->[0]->domain,  '',     'no domain value';
 is $cookies->[1], undef, 'no more cookies';
-$cookies = Mojo::Cookie::Response->parse('foo="ba r"; Expires; Path=/test');
+$cookies
+  = Mojo::Cookie::Response->parse('foo="ba r"; Expires; Domain; Path=/test');
 is $cookies->[0]->name,    'foo',  'right name';
 is $cookies->[0]->value,   'ba r', 'right value';
 is $cookies->[0]->expires, undef,  'no expires value';
+is $cookies->[0]->domain,  undef,  'no domain value';
 is $cookies->[1], undef, 'no more cookies';
 
 # Response cookie with Max-Age 0 and Expires 0