[Jifty-commit] jifty branch, master, updated. 77480b1dac5af2b92ba1c6147bce8cc7f2435ae1
Jifty commits
jifty-commit at lists.jifty.org
Tue May 11 10:44:02 EDT 2010
The branch, master has been updated
via 77480b1dac5af2b92ba1c6147bce8cc7f2435ae1 (commit)
via 7511687b05acf82cc20d24d443a3b12b19fc42db (commit)
from 94f5231574ca1519511e57cbc9f7d2752b7c11c2 (commit)
Summary of changes:
lib/Jifty/Handler.pm | 1 +
.../Plugin/Authentication/Password/Action/Login.pm | 3 ++-
lib/Jifty/View.pm | 1 -
lib/Jifty/View/Mason/Handler.pm | 2 --
4 files changed, 3 insertions(+), 4 deletions(-)
- Log -----------------------------------------------------------------
commit 7511687b05acf82cc20d24d443a3b12b19fc42db
Author: Chia-liang Kao <clkao at clkao.org>
Date: Tue May 11 21:59:31 2010 +0800
Webkit does not like expires: +1y cookies, for a good reason.
diff --git a/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm b/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm
index 9985bfb..b8ef4e9 100755
--- a/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm
+++ b/lib/Jifty/Plugin/Authentication/Password/Action/Login.pm
@@ -10,6 +10,7 @@ Jifty::Plugin::Authentication::Password::Action::Login - process login with pass
package Jifty::Plugin::Authentication::Password::Action::Login;
use base qw/Jifty::Action/;
use Digest::MD5 qw(md5_hex);
+use HTTP::Date ();
use constant TOKEN_EXPIRE_TIME => 30;
@@ -221,7 +222,7 @@ sub take_action {
# Actually do the signin thing.
Jifty->web->current_user(Jifty->app_class('CurrentUser')->new( id => $user->id));
- Jifty->web->session->expires( $self->argument_value('remember') ? '+1y' : undef );
+ Jifty->web->session->expires($self->argument_value('remember') ? HTTP::Date::time2str( time() + 31536000 ) : undef);
Jifty->web->session->set_cookie;
return 1;
commit 77480b1dac5af2b92ba1c6147bce8cc7f2435ae1
Author: Chia-liang Kao <clkao at clkao.org>
Date: Tue May 11 22:27:00 2010 +0800
Call set_cookie in jifty::handler, avoiding every subrequest to set cookies.
diff --git a/lib/Jifty/Handler.pm b/lib/Jifty/Handler.pm
index 75e6703..2fb3c01 100644
--- a/lib/Jifty/Handler.pm
+++ b/lib/Jifty/Handler.pm
@@ -252,6 +252,7 @@ sub handle_request {
}
$self->log->info( Jifty->web->request->method . " request for " . Jifty->web->request->path );
Jifty->web->setup_session;
+ Jifty->web->session->set_cookie;
Jifty::I18N->get_language_handle;
diff --git a/lib/Jifty/View.pm b/lib/Jifty/View.pm
index 9cb56b4..ff2bdc2 100644
--- a/lib/Jifty/View.pm
+++ b/lib/Jifty/View.pm
@@ -36,7 +36,6 @@ sends a header if need be.
=cut
sub out_method {
- Jifty->web->session->set_cookie;
my $r = Jifty->web->response;
# Send a header
diff --git a/lib/Jifty/View/Mason/Handler.pm b/lib/Jifty/View/Mason/Handler.pm
index 1a3fe70..20e667f 100644
--- a/lib/Jifty/View/Mason/Handler.pm
+++ b/lib/Jifty/View/Mason/Handler.pm
@@ -210,8 +210,6 @@ sub show {
sub _comp_setup {
my ($self, $comp, $args) = @_;
- Jifty->web->session->set_cookie;
-
# XXX FIXME This is a kludge to get use_mason_wrapper to work
$self->interp->set_global('$jifty_internal_request', 0);
$self->interp->set_global('$jifty_internal_request', 1) if defined $args;
-----------------------------------------------------------------------
More information about the Jifty-commit
mailing list