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=23402db845ab80017a94234fbff5268fcc617057;hp=15f8c810bd2bcd6a7c550558e294ba3ff00f695e;hb=7022ec4c0fd4943997c9c5621d3e1972d0c7c929;hpb=c702e4cad3a7fd162125607fe4ff0c491d80e3a1

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 15f8c81..23402db 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -6,13 +6,14 @@ use warnings;
 
 use NEXT;
 
-our $VERSION = "0.01";
+our $VERSION = "0.02";
 
 sub setup_session {
     my $c = shift;
 
     $c->NEXT::setup_session(@_);
-    $c->config->{session}{cookie_name} ||= Catalyst::Utils::appprefix( $c );
+    $c->config->{session}{cookie_name}
+        ||= Catalyst::Utils::appprefix($c) . '_session';
 }
 
 sub finalize_cookies {
@@ -41,11 +42,15 @@ sub make_session_cookie {
     };
 
     if ( exists $cfg->{cookie_expires} ) {
-        if ( my $ttl = $cfg->{cookie_expires} ) {
-            $cookie->{expires} = time() + $ttl;
-        }    # else { cookie is non-persistent }
+        if ( $cfg->{cookie_expires} > 0 ) {
+            $cookie->{expires} = time() + $cfg->{cookie_expires};
+        }
+        else {
+            $cookie->{expires} = undef;
+        }
     }
     else {
+        # XXX: FIXME, Session dropped __expires
         $cookie->{expires} = $c->session->{__expires};
     }
 
@@ -128,12 +133,18 @@ Will set the C<cookie_name> parameter to it's default value if it isn't set.
 
 =item cookie_name
 
-The name of the cookie to store (defaults to C<Catalyst::Utils::apprefix($c)>).
+The name of the cookie to store (defaults to C<Catalyst::Utils::apprefix($c) . '_session'>).
 
 =item cookie_domain
 
 The name of the domain to store in the cookie (defaults to current host)
 
+=item cookie_expires
+
+Number of seconds from now you want to elapse before cookie will expire. 
+Set to 0 to create a session cookie, ie one which will die when the 
+user's browser is shut down.
+
 =back
 
 =head1 CAVEATS