ruby-changes:54099
From: nobu <ko1@a...>
Date: Tue, 11 Dec 2018 09:05:58 +0900 (JST)
Subject: [ruby-changes:54099] nobu:r66320 (trunk): Fix r663197
nobu 2018-12-11 09:05:53 +0900 (Tue, 11 Dec 2018) New Revision: 66320 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=66320 Log: Fix r663197 Modified files: trunk/lib/net/http/header.rb Index: lib/net/http/header.rb =================================================================== --- lib/net/http/header.rb (revision 66319) +++ lib/net/http/header.rb (revision 66320) @@ -22,7 +22,7 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/lib/net/http/header.rb#L22 if value.count("\r\n") > 0 raise ArgumentError, "header #{key} has field value #{value.inspect}, this cannot include CR/LF" end - @header[key.to_str.downcase] = [value] + @header[key.to_s.downcase] = [value] end end end @@ -36,14 +36,14 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/lib/net/http/header.rb#L36 # Returns the header field corresponding to the case-insensitive key. # For example, a key of "Content-Type" might return "text/html" def [](key) - a = @header[key.to_str.downcase] or return nil + a = @header[key.to_s.downcase] or return nil a.join(', ') end # Sets the header field corresponding to the case-insensitive key. def []=(key, val) unless val - @header.delete key.to_str.downcase + @header.delete key.to_s.downcase return val end set_field(key, val) @@ -65,7 +65,7 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/lib/net/http/header.rb#L65 # p request.get_fields('X-My-Header') #=> ["a", "b", "c"] # def add_field(key, val) - stringified_downcased_key = key.to_str.downcase + stringified_downcased_key = key.to_s.downcase if @header.key?(stringified_downcased_key) append_field_value(@header[stringified_downcased_key], val) else @@ -78,13 +78,13 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/lib/net/http/header.rb#L78 when Enumerable ary = [] append_field_value(ary, val) - @header[key.to_str.downcase] = ary + @header[key.to_s.downcase] = ary else val = val.to_s # for compatibility use to_s instead of to_str if val.b.count("\r\n") > 0 raise ArgumentError, 'header field value cannot include CR/LF' end - @header[key.to_str.downcase] = [val] + @header[key.to_s.downcase] = [val] end end @@ -113,7 +113,7 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/lib/net/http/header.rb#L113 # #=> "session=al98axx; expires=Fri, 31-Dec-1999 23:58:23, query=rubyscript; expires=Fri, 31-Dec-1999 23:58:23" # def get_fields(key) - stringified_downcased_key = key.to_str.downcase + stringified_downcased_key = key.to_s.downcase return nil unless @header[stringified_downcased_key] @header[stringified_downcased_key].dup end @@ -123,7 +123,7 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/lib/net/http/header.rb#L123 # raises an IndexError if there's no header field named +key+ # See Hash#fetch def fetch(key, *args, &block) #:yield: +key+ - a = @header.fetch(key.to_str.downcase, *args, &block) + a = @header.fetch(key.to_s.downcase, *args, &block) a.kind_of?(Array) ? a.join(', ') : a end @@ -184,12 +184,12 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/lib/net/http/header.rb#L184 # Removes a header field, specified by case-insensitive key. def delete(key) - @header.delete(key.to_str.downcase) + @header.delete(key.to_s.downcase) end # true if +key+ header exists. def key?(key) - @header.key?(key.to_str.downcase) + @header.key?(key.to_s.downcase) end # Returns a Hash consisting of header names and array of values. -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/