Ruby 1.9 compat: cookies
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8405 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
2703d55935
commit
11dde5ca2f
|
@ -56,10 +56,6 @@ class CGI #:nodoc:
|
||||||
super(@value)
|
super(@value)
|
||||||
end
|
end
|
||||||
|
|
||||||
def __setobj__(obj)
|
|
||||||
@_dc_obj = obj
|
|
||||||
end
|
|
||||||
|
|
||||||
# Set whether the Cookie is a secure cookie or not.
|
# Set whether the Cookie is a secure cookie or not.
|
||||||
def secure=(val)
|
def secure=(val)
|
||||||
@secure = val == true
|
@secure = val == true
|
||||||
|
@ -93,7 +89,7 @@ class CGI #:nodoc:
|
||||||
cookies = Hash.new([])
|
cookies = Hash.new([])
|
||||||
|
|
||||||
if raw_cookie
|
if raw_cookie
|
||||||
raw_cookie.split(/; ?/).each do |pairs|
|
raw_cookie.split(/[;,]\s?/).each do |pairs|
|
||||||
name, values = pairs.split('=',2)
|
name, values = pairs.split('=',2)
|
||||||
next unless name and values
|
next unless name and values
|
||||||
name = CGI::unescape(name)
|
name = CGI::unescape(name)
|
||||||
|
|
|
@ -72,12 +72,12 @@ class CgiRequestTest < BaseCgiTest
|
||||||
|
|
||||||
def test_cookie_syntax_resilience
|
def test_cookie_syntax_resilience
|
||||||
cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
|
cookies = CGI::Cookie::parse(@request_hash["HTTP_COOKIE"]);
|
||||||
assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"]
|
assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], cookies["_session_id"], cookies.inspect
|
||||||
assert_equal ["yes"], cookies["is_admin"]
|
assert_equal ["yes"], cookies["is_admin"], cookies.inspect
|
||||||
|
|
||||||
alt_cookies = CGI::Cookie::parse(@alt_cookie_fmt_request_hash["HTTP_COOKIE"]);
|
alt_cookies = CGI::Cookie::parse(@alt_cookie_fmt_request_hash["HTTP_COOKIE"]);
|
||||||
assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], alt_cookies["_session_id"]
|
assert_equal ["c84ace84796670c052c6ceb2451fb0f2"], alt_cookies["_session_id"], alt_cookies.inspect
|
||||||
assert_equal ["yes"], alt_cookies["is_admin"]
|
assert_equal ["yes"], alt_cookies["is_admin"], alt_cookies.inspect
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue