diff options
| -rw-r--r-- | actionpack/lib/action_controller/metal/request_forgery_protection.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 8 |
2 files changed, 4 insertions, 7 deletions
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb index b5e1a7ac1e..8def048178 100644 --- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb +++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb @@ -162,9 +162,8 @@ module ActionController #:nodoc: class NullCookieJar < ActionDispatch::Cookies::CookieJar #:nodoc: def self.build(request) host = request.host - secure = request.ssl? - new(host, secure, request) + new(host, request) end def write(*) diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index fbcff3cd94..275e16c802 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -260,17 +260,15 @@ module ActionDispatch def self.build(req, cookies) host = req.host - secure = req.ssl? - new(host, secure, req).tap do |hash| + new(host, req).tap do |hash| hash.update(cookies) end end - def initialize(host = nil, secure = false, request) + def initialize(host = nil, request) @set_cookies = {} @delete_cookies = {} @host = host - @secure = secure @request = request @cookies = {} @committed = false @@ -394,7 +392,7 @@ module ActionDispatch private def write_cookie?(cookie) - @secure || !cookie[:secure] || always_write_cookie + @request.ssl? || !cookie[:secure] || always_write_cookie end end |