mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
remove @secure ivar
This commit is contained in:
parent
78960cf560
commit
aad33d5808
2 changed files with 4 additions and 7 deletions
|
@ -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(*)
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in a new issue