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=0bef033433cf8dbec9dbe96d6aad6f7295716b89;hp=70e0aefc427894d80b249ec46a777f7ba8a2652d;hb=1e986fd57422a13babc4305f9f95f1d50b71c2cd;hpb=75d3560da895b67e3b9abd09db714b32f329b8e8

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 70e0aef..0bef033 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -42,19 +42,27 @@ sub make_session_cookie {
         ( $cfg->{cookie_domain} ? ( domain => $cfg->{cookie_domain} ) : () ),
     };
 
+    $cookie->{expires}=$c->calc_expiry();
+
+    return $cookie;
+}
+
+sub calc_expiry {
+    my $c=shift;
+    my $cfg    = $c->config->{session};
+    my $value= $c->NEXT::calc_expiry(@_);
+    return $value if $value;
     if ( exists $cfg->{cookie_expires} ) {
         if ( $cfg->{cookie_expires} > 0 ) {
-            $cookie->{expires} = time() + $cfg->{cookie_expires};
+            return time() + $cfg->{cookie_expires};
         }
         else {
-            $cookie->{expires} = undef;
+            return undef;
         }
     }
     else {
-        $cookie->{expires} = $c->session_expires;
+       return $c->session_expires;
     }
-
-    return $cookie;
 }
 
 sub prepare_cookies {