diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-15 19:36:13 +0200 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2015-09-15 19:36:13 +0200 |
| commit | 9347538312ba796ac698f06068b213ed17924e08 (patch) | |
| tree | 33dca68b88ba54f8c164edbd6d1aa6975f9e0a16 /actionpack | |
| parent | 005ebe72df7d769ea739c4a17d17d250d98daa42 (diff) | |
| parent | 1fd99224dc7776e6887392d41330b4c126f35c76 (diff) | |
| download | rails-9347538312ba796ac698f06068b213ed17924e08.tar.gz rails-9347538312ba796ac698f06068b213ed17924e08.tar.bz2 rails-9347538312ba796ac698f06068b213ed17924e08.zip | |
Merge pull request #21634 from JuanitoFatas/feature/fewer-rack-env-direct-manipulate
Use rack.session_options instead of directly change env
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index 2ddf34f40f..5674eef67b 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -138,7 +138,7 @@ module ActionController #:nodoc: request = @controller.request request.session = NullSessionHash.new(request) request.flash = nil - request.env['rack.session.options'] = { skip: true } + request.session_options = { skip: true } request.cookie_jar = NullCookieJar.build(request, {}) end |