X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Plugin-Session-State-Cookie.git;a=blobdiff_plain;f=lib%2FCatalyst%2FPlugin%2FSession%2FState%2FCookie.pm;h=857e454e1f3e426e1606d6d1bbd540be8c92217d;hp=3d8bd1b7225322ea9cc0d71e79c5ea38b71f6c77;hb=c3f2575c7016000e1693b29df140c51ba32e078a;hpb=5e50008f1cfc2adca19810a28c1680e0221f2492

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 3d8bd1b..857e454 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -6,23 +6,28 @@ use warnings;
 
 use NEXT;
 
+our $VERSION = "0.01";
+
 sub setup_session {
-	my $c = shift;
+    my $c = shift;
 
-	$c->NEXT::setup_session(@_);
+    $c->NEXT::setup_session(@_);
 
-	$c->config->{session}{cookie_name} ||= "session";
+    $c->config->{session}{cookie_name} ||= "session";
 }
 
 sub finalize {
     my $c = shift;
 
-	my $cookie_name = $c->config->{session}{cookie_name};
+    my $cookie_name = $c->config->{session}{cookie_name};
 
     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}
+			};
             $c->log->debug(qq/A cookie with the session id "$sid" was saved/)
               if $c->debug;
         }
@@ -34,7 +39,9 @@ sub finalize {
 sub prepare_cookies {
     my $c = shift;
 
-	my $cookie_name = $c->config->{session}{cookie_name};
+    my $ret = $c->NEXT::prepare_cookies(@_);
+
+    my $cookie_name = $c->config->{session}{cookie_name};
 
     if ( my $cookie = $c->request->cookies->{$cookie_name} ) {
         my $sid = $cookie->value;
@@ -42,7 +49,7 @@ sub prepare_cookies {
         $c->log->debug(qq/Found sessionid "$sid" in cookie/) if $c->debug;
     }
 
-    $c->NEXT::prepare_cookies(@_);
+    return $ret;
 }
 
 __PACKAGE__
@@ -57,7 +64,7 @@ Catalyst::Plugin::Session::State::Cookie - A session ID
 
 =head1 SYNOPSIS
 
-	use Catalyst qw/Session Session::State::Cookie Session::Store::Foo/;
+    use Catalyst qw/Session Session::State::Cookie Session::Store::Foo/;
 
 =head1 DESCRIPTION
 
@@ -76,7 +83,12 @@ Will restore if an appropriate cookie is found.
 
 =item finalize
 
-Will set a cookie called C<session> if it doesn't exist or if it's value is not the current session id.
+Will set a cookie called C<session> if it doesn't exist or if it's value is not
+the current session id.
+
+=item setup_session
+
+Will set the C<cookie_name> parameter to it's default value if it isn't set.
 
 =back