kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

remove @secure ivar

Browse source
This commit is contained in:
Aaron Patterson 2015-08-05 18:15:08 -07:00
parent 78960cf560
commit aad33d5808
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
actionpack/lib/action_controller/metal/request_forgery_protection.rb
View file

@ -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(*)

8
actionpack/lib/action_dispatch/middleware/cookies.rb
View file

@ -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