[Catalyst-commits] r6254 - trunk/Catalyst-Plugin-Session-State-Cookie/lib/Catalyst/Plugin/Session/State

[nothingmuch at dev.catalyst.perl.org]

Author: nothingmuch
Date: 2007-04-03 02:41:33 +0100 (Tue, 03 Apr 2007)
New Revision: 6254

Modified:
   trunk/Catalyst-Plugin-Session-State-Cookie/lib/Catalyst/Plugin/Session/State/Cookie.pm
Log:
fix LTJake's always expiring second session issue

Modified: trunk/Catalyst-Plugin-Session-State-Cookie/lib/Catalyst/Plugin/Session/State/Cookie.pm
===================================================================
--- trunk/Catalyst-Plugin-Session-State-Cookie/lib/Catalyst/Plugin/Session/State/Cookie.pm	2007-04-03 00:30:58 UTC (rev 6253)
+++ trunk/Catalyst-Plugin-Session-State-Cookie/lib/Catalyst/Plugin/Session/State/Cookie.pm	2007-04-03 01:41:33 UTC (rev 6254)
@@ -1,5 +1,5 @@
 package Catalyst::Plugin::Session::State::Cookie;
-use base qw/Catalyst::Plugin::Session::State/;
+use base qw/Catalyst::Plugin::Session::State Class::Accessor::Fast/;
 
 use strict;
 use warnings;
@@ -7,8 +7,10 @@
 use NEXT;
 use Catalyst::Utils ();
 
-our $VERSION = "0.06";
+our $VERSION = "0.07";
 
+BEGIN { __PACKAGE__->mk_accessors(qw/_deleted_session_id/) }
+
 sub setup_session {
     my $c = shift;
 
@@ -111,7 +113,7 @@
 sub get_session_id {
     my $c = shift;
 
-    if ( my $cookie = $c->get_session_cookie  ) { 
+    if ( !$c->_deleted_session_id and my $cookie = $c->get_session_cookie ) { 
         my $sid = $cookie->value;
         $c->log->debug(qq/Found sessionid "$sid" in cookie/) if $c->debug;
         return $sid if $sid;
@@ -122,6 +124,8 @@
 
 sub delete_session_id {
     my ( $c, $sid ) = @_;
+    
+    $c->_deleted_session_id(1); # to prevent get_session_id from returning it
 
     $c->update_session_cookie( $c->make_session_cookie( $sid, expires => 0 ) );