sjs/http-cookie
1
0
Fork 0
mirror of https://github.com/samsonjs/http-cookie.git synced 2026-04-27 14:57:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cookie#max_age= should not reset #expires when it fails.

Browse source
This commit is contained in:
Akinori MUSHA 2013-04-18 22:22:11 +09:00
parent 640ea1b297
commit a0202e2192
2 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/http/cookie.rb
View file

@ -497,7 +497,6 @@ class HTTP::Cookie
# See #max_age. # See #max_age.
def max_age= sec def max_age= sec
@expires = nil
case sec case sec
when Integer, nil when Integer, nil
else else
@ -507,6 +506,7 @@ class HTTP::Cookie
raise ArgumentError, "invalid Max-Age: #{sec.inspect}" raise ArgumentError, "invalid Max-Age: #{sec.inspect}"
sec = str.to_i sec = str.to_i
end end
@expires = nil
if @session = sec.nil? if @session = sec.nil?
@max_age = nil @max_age = nil
else else

13
test/test_http_cookie.rb
View file

@ -692,19 +692,32 @@ class TestHTTPCookie < Test::Unit::TestCase
def test_max_age= def test_max_age=
cookie = HTTP::Cookie.new(cookie_values) cookie = HTTP::Cookie.new(cookie_values)
expires = cookie.expires
assert_raises(ArgumentError) { assert_raises(ArgumentError) {
cookie.max_age = "+1" cookie.max_age = "+1"
} }
# make sure #expires is not destroyed
assert_equal expires, cookie.expires
assert_raises(ArgumentError) { assert_raises(ArgumentError) {
cookie.max_age = "1.5" cookie.max_age = "1.5"
} }
# make sure #expires is not destroyed
assert_equal expires, cookie.expires
assert_raises(ArgumentError) { assert_raises(ArgumentError) {
cookie.max_age = "1 day" cookie.max_age = "1 day"
} }
# make sure #expires is not destroyed
assert_equal expires, cookie.expires
assert_raises(TypeError) { assert_raises(TypeError) {
cookie.max_age = [1] cookie.max_age = [1]
} }
# make sure #expires is not destroyed
assert_equal expires, cookie.expires
cookie.max_age = "12" cookie.max_age = "12"
assert_equal 12, cookie.max_age assert_equal 12, cookie.max_age