From 0bd0477ba62fdbcb2fd36a3fc3cca10b5ecb80cc Mon Sep 17 00:00:00 2001 From: J.V. Sman Date: Wed, 8 Sep 2010 02:12:22 +0200 Subject: [PATCH] handled case where no cookie exists on the client side --- .../action_controller/session/abstract_store.rb | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/actionpack/lib/action_controller/session/abstract_store.rb b/actionpack/lib/action_controller/session/abstract_store.rb index 11cb6c2..95db7d0 100644 --- a/actionpack/lib/action_controller/session/abstract_store.rb +++ b/actionpack/lib/action_controller/session/abstract_store.rb @@ -188,7 +188,7 @@ module ActionController return response end - if (env["rack.request.cookie_hash"] && env["rack.request.cookie_hash"][@key] != sid) || options[:expire_after] + if (env["rack.request.cookie_hash"] && env["rack.request.cookie_hash"][@key] != sid) || options[:expire_after] || env["rack.request.cookie_hash"].nil? cookie = Rack::Utils.escape(@key) + '=' + Rack::Utils.escape(sid) cookie << "; domain=#{options[:domain]}" if options[:domain] cookie << "; path=#{options[:path]}" if options[:path] -- 1.7.2.2