Preserve HTTP header key as string [Bug #15394]
to prevent send Host header twice accidentally. From: Sangyong Sim <sangyong-sim@cookpad.com> git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66319 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
8a758e87f2
commit
1bf066dcfa
@ -22,7 +22,7 @@ module Net::HTTPHeader
|
|||||||
if value.count("\r\n") > 0
|
if value.count("\r\n") > 0
|
||||||
raise ArgumentError, "header #{key} has field value #{value.inspect}, this cannot include CR/LF"
|
raise ArgumentError, "header #{key} has field value #{value.inspect}, this cannot include CR/LF"
|
||||||
end
|
end
|
||||||
@header[key.downcase] = [value]
|
@header[key.to_str.downcase] = [value]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -36,14 +36,14 @@ module Net::HTTPHeader
|
|||||||
# Returns the header field corresponding to the case-insensitive key.
|
# Returns the header field corresponding to the case-insensitive key.
|
||||||
# For example, a key of "Content-Type" might return "text/html"
|
# For example, a key of "Content-Type" might return "text/html"
|
||||||
def [](key)
|
def [](key)
|
||||||
a = @header[key.downcase] or return nil
|
a = @header[key.to_str.downcase] or return nil
|
||||||
a.join(', ')
|
a.join(', ')
|
||||||
end
|
end
|
||||||
|
|
||||||
# Sets the header field corresponding to the case-insensitive key.
|
# Sets the header field corresponding to the case-insensitive key.
|
||||||
def []=(key, val)
|
def []=(key, val)
|
||||||
unless val
|
unless val
|
||||||
@header.delete key.downcase
|
@header.delete key.to_str.downcase
|
||||||
return val
|
return val
|
||||||
end
|
end
|
||||||
set_field(key, val)
|
set_field(key, val)
|
||||||
@ -65,8 +65,9 @@ module Net::HTTPHeader
|
|||||||
# p request.get_fields('X-My-Header') #=> ["a", "b", "c"]
|
# p request.get_fields('X-My-Header') #=> ["a", "b", "c"]
|
||||||
#
|
#
|
||||||
def add_field(key, val)
|
def add_field(key, val)
|
||||||
if @header.key?(key.downcase)
|
stringified_downcased_key = key.to_str.downcase
|
||||||
append_field_value(@header[key.downcase], val)
|
if @header.key?(stringified_downcased_key)
|
||||||
|
append_field_value(@header[stringified_downcased_key], val)
|
||||||
else
|
else
|
||||||
set_field(key, val)
|
set_field(key, val)
|
||||||
end
|
end
|
||||||
@ -77,13 +78,13 @@ module Net::HTTPHeader
|
|||||||
when Enumerable
|
when Enumerable
|
||||||
ary = []
|
ary = []
|
||||||
append_field_value(ary, val)
|
append_field_value(ary, val)
|
||||||
@header[key.downcase] = ary
|
@header[key.to_str.downcase] = ary
|
||||||
else
|
else
|
||||||
val = val.to_s # for compatibility use to_s instead of to_str
|
val = val.to_s # for compatibility use to_s instead of to_str
|
||||||
if val.b.count("\r\n") > 0
|
if val.b.count("\r\n") > 0
|
||||||
raise ArgumentError, 'header field value cannot include CR/LF'
|
raise ArgumentError, 'header field value cannot include CR/LF'
|
||||||
end
|
end
|
||||||
@header[key.downcase] = [val]
|
@header[key.to_str.downcase] = [val]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -112,8 +113,9 @@ module Net::HTTPHeader
|
|||||||
# #=> "session=al98axx; expires=Fri, 31-Dec-1999 23:58:23, query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"
|
# #=> "session=al98axx; expires=Fri, 31-Dec-1999 23:58:23, query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23"
|
||||||
#
|
#
|
||||||
def get_fields(key)
|
def get_fields(key)
|
||||||
return nil unless @header[key.downcase]
|
stringified_downcased_key = key.to_str.downcase
|
||||||
@header[key.downcase].dup
|
return nil unless @header[stringified_downcased_key]
|
||||||
|
@header[stringified_downcased_key].dup
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns the header field corresponding to the case-insensitive key.
|
# Returns the header field corresponding to the case-insensitive key.
|
||||||
@ -121,7 +123,7 @@ module Net::HTTPHeader
|
|||||||
# raises an IndexError if there's no header field named +key+
|
# raises an IndexError if there's no header field named +key+
|
||||||
# See Hash#fetch
|
# See Hash#fetch
|
||||||
def fetch(key, *args, &block) #:yield: +key+
|
def fetch(key, *args, &block) #:yield: +key+
|
||||||
a = @header.fetch(key.downcase, *args, &block)
|
a = @header.fetch(key.to_str.downcase, *args, &block)
|
||||||
a.kind_of?(Array) ? a.join(', ') : a
|
a.kind_of?(Array) ? a.join(', ') : a
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -182,12 +184,12 @@ module Net::HTTPHeader
|
|||||||
|
|
||||||
# Removes a header field, specified by case-insensitive key.
|
# Removes a header field, specified by case-insensitive key.
|
||||||
def delete(key)
|
def delete(key)
|
||||||
@header.delete(key.downcase)
|
@header.delete(key.to_str.downcase)
|
||||||
end
|
end
|
||||||
|
|
||||||
# true if +key+ header exists.
|
# true if +key+ header exists.
|
||||||
def key?(key)
|
def key?(key)
|
||||||
@header.key?(key.downcase)
|
@header.key?(key.to_str.downcase)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Returns a Hash consisting of header names and array of values.
|
# Returns a Hash consisting of header names and array of values.
|
||||||
|
@ -31,6 +31,11 @@ class HTTPHeaderTest < Test::Unit::TestCase
|
|||||||
assert_raise(ArgumentError){ @c.initialize_http_header("foo"=>"a\xff") }
|
assert_raise(ArgumentError){ @c.initialize_http_header("foo"=>"a\xff") }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_initialize_with_symbol
|
||||||
|
@c.initialize_http_header(foo: "abc")
|
||||||
|
assert_equal "abc", @c["foo"]
|
||||||
|
end
|
||||||
|
|
||||||
def test_size
|
def test_size
|
||||||
assert_equal 0, @c.size
|
assert_equal 0, @c.size
|
||||||
@c['a'] = 'a'
|
@c['a'] = 'a'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user