aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/request_forgery_protection.rb
diff options
context:
space:
mode:
authorRonak Jangir <ronakjangir47@gmail.com>2015-08-23 19:11:37 +0530
committerRonak Jangir <ronakjangir47@gmail.com>2015-08-23 19:11:37 +0530
commit688bcc8e5b80f5281cbdbc512ee79b54f5519182 (patch)
tree81213095ef92c451ea495436d80a8815b25d772e /actionpack/lib/action_controller/metal/request_forgery_protection.rb
parent3cbaeb16013ef488a9619dd00dd00fe49bb6994d (diff)
downloadrails-688bcc8e5b80f5281cbdbc512ee79b54f5519182.tar.gz
rails-688bcc8e5b80f5281cbdbc512ee79b54f5519182.tar.bz2
rails-688bcc8e5b80f5281cbdbc512ee79b54f5519182.zip
Another place to use a request object in NullSessionHash
May be missed in 5fe141638f1243ac6ae187ae14aa398b4c1875a2 commit Also fixes the broken build
Diffstat (limited to 'actionpack/lib/action_controller/metal/request_forgery_protection.rb')
-rw-r--r--actionpack/lib/action_controller/metal/request_forgery_protection.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index d21a778d8d..e5f3cb8e8d 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -136,7 +136,7 @@ module ActionController #:nodoc:
# This is the method that defines the application behavior when a request is found to be unverified.
def handle_unverified_request
request = @controller.request
- request.session = NullSessionHash.new(request.env)
+ request.session = NullSessionHash.new(request)
request.env['action_dispatch.request.flash_hash'] = nil
request.env['rack.session.options'] = { skip: true }
request.cookie_jar = NullCookieJar.build(request, {})
@@ -145,8 +145,8 @@ module ActionController #:nodoc:
protected
class NullSessionHash < Rack::Session::Abstract::SessionHash #:nodoc:
- def initialize(env)
- super(nil, env)
+ def initialize(req)
+ super(nil, req)
@data = {}
@loaded = true
end