aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-08-22 17:57:45 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-08-22 17:57:45 -0700
commit5fe141638f1243ac6ae187ae14aa398b4c1875a2 (patch)
tree699f8e31db610dc66ab08e4c5d748076b29dea3a /actionpack/lib/action_dispatch/http
parent4f244f7cab1945d621f171f01c357d80dee09a7e (diff)
downloadrails-5fe141638f1243ac6ae187ae14aa398b4c1875a2.tar.gz
rails-5fe141638f1243ac6ae187ae14aa398b4c1875a2.tar.bz2
rails-5fe141638f1243ac6ae187ae14aa398b4c1875a2.zip
use a request object in the session middleware
This commit allows us to use one request object rather than allocating multiple request objects to deal with the session.
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
-rw-r--r--actionpack/lib/action_dispatch/http/request.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index 4dba0d968f..4748a54550 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -314,11 +314,11 @@ module ActionDispatch
end
def session=(session) #:nodoc:
- Session.set @env, session
+ Session.set self, session
end
def session_options=(options)
- Session::Options.set @env, options
+ Session::Options.set self, options
end
# Override Rack's GET method to support indifferent access