aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/request
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-20 13:43:57 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-20 13:45:11 -0700
commit51211a94bd7a34d80f2412a7f94fefe7366647a5 (patch)
treeb4b3df2f609e9a1390e45130968bd6c10df589d0 /actionpack/lib/action_dispatch/request
parent86e0136f4815ebf5b3a3eadbf980b36735ec6748 (diff)
downloadrails-51211a94bd7a34d80f2412a7f94fefe7366647a5.tar.gz
rails-51211a94bd7a34d80f2412a7f94fefe7366647a5.tar.bz2
rails-51211a94bd7a34d80f2412a7f94fefe7366647a5.zip
point at rack master
Diffstat (limited to 'actionpack/lib/action_dispatch/request')
-rw-r--r--actionpack/lib/action_dispatch/request/session.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/request/session.rb b/actionpack/lib/action_dispatch/request/session.rb
index a8a3cd20b9..bae3d909fa 100644
--- a/actionpack/lib/action_dispatch/request/session.rb
+++ b/actionpack/lib/action_dispatch/request/session.rb
@@ -4,8 +4,8 @@ module ActionDispatch
class Request < Rack::Request
# Session is responsible for lazily loading the session from store.
class Session # :nodoc:
- ENV_SESSION_KEY = Rack::Session::Abstract::ENV_SESSION_KEY # :nodoc:
- ENV_SESSION_OPTIONS_KEY = Rack::Session::Abstract::ENV_SESSION_OPTIONS_KEY # :nodoc:
+ ENV_SESSION_KEY = Rack::RACK_SESSION # :nodoc:
+ ENV_SESSION_OPTIONS_KEY = Rack::RACK_SESSION_OPTIONS # :nodoc:
# Singleton object used to determine if an optional param wasn't specified
Unspecified = Object.new