improved cookie header generation slightly

mojolicious · Dec 28, 2011 · 3c092ad · 3c092ad
1 parent 48cfa41
commit 3c092ad
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/lib/Mojo/Message/Request.pm b/lib/Mojo/Message/Request.pm
@@ -40,24 +40,18 @@ sub cookies {
   my $self = shift;
 
   # Add cookies
+  my $headers = $self->headers;
   if (@_) {
-    my $cookies = shift;
-    $cookies = Mojo::Cookie::Request->new($cookies)
-      if ref $cookies eq 'HASH';
-    $cookies = $cookies->to_string;
     for my $cookie (@_) {
-      $cookie = Mojo::Cookie::Request->new($cookie)
-        if ref $cookie eq 'HASH';
-      $cookies .= "; $cookie";
+      $cookie = Mojo::Cookie::Request->new($cookie) if ref $cookie eq 'HASH';
+      $self->headers->add('Cookie', "$cookie");
     }
-    $self->headers->add('Cookie', $cookies);
     return $self;
   }
 
   # Cookie
   my @cookies;
-  push @cookies, @{Mojo::Cookie::Request->parse($_)}
-    for $self->headers->cookie;
+  push @cookies, @{Mojo::Cookie::Request->parse($_)} for $headers->cookie;
   return \@cookies;
 }
 

diff --git a/lib/Mojo/Message/Response.pm b/lib/Mojo/Message/Response.pm
@@ -82,20 +82,19 @@ sub cookies {
   my $self = shift;
 
   # Add cookies
+  my $headers = $self->headers;
   if (@_) {
     for my $cookie (@_) {
-      $cookie = Mojo::Cookie::Response->new($cookie)
-        if ref $cookie eq 'HASH';
-      $self->headers->add('Set-Cookie', "$cookie");
+      $cookie = Mojo::Cookie::Response->new($cookie) if ref $cookie eq 'HASH';
+      $headers->add('Set-Cookie', "$cookie");
     }
     return $self;
   }
 
   # Parse cookies
   my @cookies;
   push @cookies, @{Mojo::Cookie::Response->parse($_)}
-    for $self->headers->set_cookie;
-
+    for $headers->set_cookie;
   return \@cookies;
 }
 

diff --git a/t/mojo/request.t b/t/mojo/request.t
@@ -1598,7 +1598,7 @@ ok !$req2->at_least_version('1.2'), 'not version 1.2';
 is $req2->headers->expect, '100-continue', 'right "Expect" value';
 is $req2->headers->host,   '127.0.0.1',    'right "Host" value';
 is $req2->headers->content_length, 13, 'right "Content-Length" value';
-is $req2->headers->cookie, 'foo=bar; bar=baz', 'right "Cookie" value';
+is $req2->headers->cookie, 'foo=bar, bar=baz', 'right "Cookie" value';
 is $req2->url, '/foo/bar', 'right URL';
 is $req2->url->to_abs, 'http://127.0.0.1/foo/bar', 'right absolute URL';
 is defined $req2->cookie('foo'), 1,  'right value';