Use finalize_cookies instead of finalize in Session::State::Cookie

[catagits/Catalyst-Plugin-Session-State-Cookie.git] / lib / Catalyst / Plugin / Session / State / Cookie.pm

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 741925e..aa1d9a3 100644 (file)
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -16,7 +16,7 @@ sub setup_session {
     $c->config->{session}{cookie_name} ||= "session";
 }
 
-sub finalize {
+sub finalize_cookies {
     my $c = shift;
 
     my $cookie_name = $c->config->{session}{cookie_name};
@@ -24,13 +24,19 @@ sub finalize {
     if ( my $sid = $c->sessionid ) {
         my $cookie = $c->request->cookies->{$cookie_name};
         if ( !$cookie or $cookie->value ne $sid ) {
-            $c->response->cookies->{$cookie_name} = { value => $sid };
+            $c->response->cookies->{$cookie_name} = {
+                value   => $sid,
+                expires => $c->session->{__expires},
+            };
+            if ( my $domain = $c->config->{session}{cookie_domain} ) {
+                $c->response->cookies->{$cookie_name}->{domain} = $domain;
+            }
             $c->log->debug(qq/A cookie with the session id "$sid" was saved/)
               if $c->debug;
         }
     }
 
-    return $c->NEXT::finalize(@_);
+    return $c->NEXT::finalize_cookies(@_);
 }
 
 sub prepare_cookies {
@@ -78,7 +84,7 @@ This plugin stores the session ID on the client using the cookie mechanism.
 
 Will restore if an appropriate cookie is found.
 
-=item finalize
+=item finalize_cookies
 
 Will set a cookie called C<session> if it doesn't exist or if it's value is not
 the current session id.
@@ -97,6 +103,10 @@ Will set the C<cookie_name> parameter to it's default value if it isn't set.
 
 The name of the cookie to store (defaults to C<session>).
 
+=item cookie_domain
+
+The name of the domain to store in the cookie (defaults to current host)
+
 =back
 
 =head1 SEE ALSO