made cookie parser slightly more resilient

mojolicious · Aug 26, 2011 · 34c419d · 34c419d
1 parent b708006
commit 34c419d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -62,12 +62,10 @@ sub cookies {
   }
 
   # Cookie
-  if (my $cookie = $self->headers->cookie) {
-    return Mojo::Cookie::Request->parse($cookie);
-  }
-
-  # No cookies
-  return [];
+  my @cookies;
+  push @cookies, @{Mojo::Cookie::Request->parse($_)}
+    for $self->headers->cookie;
+  return \@cookies;
 }
 
 sub fix_headers {

diff --git a/lib/Mojo/Message/Response.pm b/lib/Mojo/Message/Response.pm
@@ -89,19 +89,16 @@ sub cookies {
   }
 
   # Set-Cookie2
+  my @cookies;
   my $headers = $self->headers;
-  my $cookies = [];
-  if (my $cookie2 = $headers->set_cookie2) {
-    push @$cookies, @{Mojo::Cookie::Response->parse($cookie2)};
-  }
+  push @cookies, @{Mojo::Cookie::Response->parse($_)}
+    for $headers->set_cookie2;
 
   # Set-Cookie
-  if (my $cookie = $headers->set_cookie) {
-    push @$cookies, @{Mojo::Cookie::Response->parse($cookie)};
-  }
+  push @cookies, @{Mojo::Cookie::Response->parse($_)}
+    for $headers->set_cookie;
 
-  # No cookies
-  return $cookies;
+  return \@cookies;
 }
 
 sub default_message { $MESSAGES{$_[1] || $_[0]->code || 404} || '' }