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=7fbde70b66c4309deec3f35f7b5bfea1458dae82;hp=2ad97b76c5ee89bf8e6a71950ea343be60a07bdf;hb=3e8b97ed68abf4af61db73b5cb02e27a902642fb;hpb=2bde9162132ed51c98e86106f3b9be65459c12a3

diff --git a/lib/Catalyst/Plugin/Session/State/Cookie.pm b/lib/Catalyst/Plugin/Session/State/Cookie.pm
index 2ad97b7..7fbde70 100644
--- a/lib/Catalyst/Plugin/Session/State/Cookie.pm
+++ b/lib/Catalyst/Plugin/Session/State/Cookie.pm
@@ -7,7 +7,7 @@ use warnings;
 use NEXT;
 use Catalyst::Utils ();
 
-our $VERSION = "0.02";
+our $VERSION = "0.04";
 
 sub setup_session {
     my $c = shift;
@@ -18,14 +18,14 @@ sub setup_session {
         ||= Catalyst::Utils::appprefix($c) . '_session';
 }
 
-sub finalize_cookies {
-    my $c = shift;
+sub extend_session_id {
+    my ( $c, $sid, $expires ) = @_;
 
     if ( my $cookie = $c->get_session_cookie ) {
-        $c->update_session_cookie( $c->make_session_cookie( $cookie->value ) );
+        $c->update_session_cookie( $c->make_session_cookie( $sid ) );
     }
 
-    $c->NEXT::finalize_cookies( @_ );
+    $c->NEXT::extend_session_id( @_ );
 }
 
 sub set_session_id {
@@ -48,8 +48,8 @@ sub make_session_cookie {
     my $cfg    = $c->config->{session};
     my $cookie = {
         value => $sid,
-        %attrs,
         ( $cfg->{cookie_domain} ? ( domain => $cfg->{cookie_domain} ) : () ),
+        %attrs,
     };
 
     unless ( exists $cookie->{expires} ) {
@@ -107,9 +107,11 @@ sub get_session_id {
 }
 
 sub delete_session_id {
-    my $c = shift;
-    $c->NEXT::delete_session_id();
-    delete $c->response->cookies->{ $c->config->{session}{cookie_name} };
+    my ( $c, $sid ) = @_;
+
+    $c->update_session_cookie( $c->make_session_cookie( $sid, expires => 0 ) );
+
+    $c->NEXT::delete_session_id($sid);
 }
 
 __PACKAGE__