[Jifty-commit] r6641 - in jifty/trunk: lib/Jifty lib/Jifty/Web lib/Jifty/Web/Session

Jifty commits jifty-commit at lists.jifty.org
Tue Mar 17 15:35:24 EDT 2009


Author: alexmv
Date: Tue Mar 17 15:35:23 2009
New Revision: 6641

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Continuation.pm
   jifty/trunk/lib/Jifty/Request.pm
   jifty/trunk/lib/Jifty/Web/Session.pm
   jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm

Log:
 r43318 at kohr-ah:  chmrr | 2009-03-17 15:32:50 -0400
 Better error-proofing for storable serialization


Modified: jifty/trunk/lib/Jifty/Continuation.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Continuation.pm	(original)
+++ jifty/trunk/lib/Jifty/Continuation.pm	Tue Mar 17 15:35:23 2009
@@ -55,6 +55,9 @@
 
 
 use Storable 'dclone';
+$Storable::Deparse = 1;
+$Storable::Eval = 1;
+$Storable::forgive_me = 1;
 
 use base qw/Class::Accessor::Fast Jifty::Object/;
 

Modified: jifty/trunk/lib/Jifty/Request.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Request.pm	(original)
+++ jifty/trunk/lib/Jifty/Request.pm	Tue Mar 17 15:35:23 2009
@@ -8,7 +8,6 @@
 
 use Jifty::JSON;
 use Jifty::YAML;
-use Storable 'dclone';
 
 =head1 NAME
 

Modified: jifty/trunk/lib/Jifty/Web/Session.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Session.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Session.pm	Tue Mar 17 15:35:23 2009
@@ -6,6 +6,9 @@
 use CGI::Cookie ();
 use DateTime ();
 use Storable ();
+$Storable::Deparse = 1;
+$Storable::Eval = 1;
+$Storable::forgive_me = 1;
 
 =head1 NAME
 
@@ -92,7 +95,6 @@
 
     # XXX TODO: we store this data in a storable. so we now want to match on the storable version
     # It would be so nice if Jifty::DBI could do this for us.
-    $Storable::Deparse = 1;
     my $encoded = Storable::nfreeze(\$v);
 
     my $session = Jifty::Model::Session->new;

Modified: jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm	(original)
+++ jifty/trunk/lib/Jifty/Web/Session/ClientSide.pm	Tue Mar 17 15:35:23 2009
@@ -112,6 +112,8 @@
     if ($data) {
         local $@;
         eval {
+            local $Storable::Eval = 0; # Just to be on the safe side...
+
             if (my $session = Storable::thaw(
                 Compress::Zlib::uncompress(
                     $self->_cipher->decrypt(


More information about the Jifty-commit mailing list