aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-05-04 11:03:37 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2012-05-04 11:03:37 -0700
commite2218b7ee5df4580df8d502cbe4ef47b4f1c4a8c (patch)
tree3b558b29b13de71405ce7d67452033909d450f80 /actionpack/lib/action_dispatch
parent638d0020a2ad92993cb9c7385ad7584618c7af1c (diff)
downloadrails-e2218b7ee5df4580df8d502cbe4ef47b4f1c4a8c.tar.gz
rails-e2218b7ee5df4580df8d502cbe4ef47b4f1c4a8c.tar.bz2
rails-e2218b7ee5df4580df8d502cbe4ef47b4f1c4a8c.zip
create a request session in the cookie stores
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/session/cookie_store.rb8
1 files changed, 8 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
index a4866f5a8f..8d673dd95e 100644
--- a/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
+++ b/actionpack/lib/action_dispatch/middleware/session/cookie_store.rb
@@ -46,6 +46,14 @@ module ActionDispatch
private
+ def prepare_session(env)
+ Request::Session.create(self, env, @default_options)
+ end
+
+ def loaded_session?(session)
+ !session.is_a?(Request::Session) || session.loaded?
+ end
+
def unpacked_cookie_data(env)
env["action_dispatch.request.unsigned_session_cookie"] ||= begin
stale_session_check! do