diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-08 12:27:11 -0800 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2013-02-08 12:27:11 -0800 |
| commit | 86bfdbb509f005f7ac1198524fe3ce4036443e4c (patch) | |
| tree | ec7c94db55a2f1962b44ed97d2180733c476042d /actionpack/lib/action_controller | |
| parent | 10d301e6ef8d98be39e0d2f6e9f6cfbfac576e4d (diff) | |
| parent | 4127332a5f516188df7b35f3f8886723b8c4859d (diff) | |
| download | rails-86bfdbb509f005f7ac1198524fe3ce4036443e4c.tar.gz rails-86bfdbb509f005f7ac1198524fe3ce4036443e4c.tar.bz2 rails-86bfdbb509f005f7ac1198524fe3ce4036443e4c.zip | |
Merge pull request #9196 from AndreyChernyh/fix-cookies-with-null-session
Fix #9168 Initialize NullCookieJar with all options needed for KeyGenerator
Diffstat (limited to 'actionpack/lib/action_controller')
| -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 77b173979e..17379cf7ac 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -126,7 +126,7 @@ module ActionController #:nodoc: host = request.host secure = request.ssl? - new(key_generator, host, secure) + new(key_generator, host, secure, options_for_env({})) end def write(*) |