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=b0376b3174197df942cabadbc4ecd5130908dc6d;hb=7022ec4c0fd4943997c9c5621d3e1972d0c7c929;hpb=ae33e13f7358be30696b7b24bc396982efc94040 diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm index b0376b3..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 ) . '_session'; + $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}; } @@ -134,6 +139,12 @@ The name of the cookie to store (defaults to C