nagachika	2017-09-08 23:27:38 +0900 (Fri, 08 Sep 2017)

  New Revision: 59783

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=59783

  Log:
    merge revision(s) 59693,59695: [Backport #13852]
    
    A HTTP Header value must not contain CR or LF.
    to_str -> to_s
    
    * lib/net/http/header.rb (set_field): `val` can not have `to_str`.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/lib/net/http/header.rb
    branches/ruby_2_4/test/net/http/test_httpheader.rb
    branches/ruby_2_4/version.h
Index: ruby_2_4/lib/net/http/header.rb
===================================================================
--- ruby_2_4/lib/net/http/header.rb	(revision 59782)
+++ ruby_2_4/lib/net/http/header.rb	(revision 59783)
@@ -42,7 +42,7 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/net/http/header.rb#L42
       @header.delete key.downcase
       return val
     end
-    @header[key.downcase] = [val]
+    set_field(key, val)
   end
 
   # [Ruby 1.8.3]
@@ -62,12 +62,40 @@ module Net::HTTPHeader https://github.com/ruby/ruby/blob/trunk/ruby_2_4/lib/net/http/header.rb#L62
   #
   def add_field(key, val)
     if @header.key?(key.downcase)
-      @header[key.downcase].push val
+      append_field_value(@header[key.downcase], val)
     else
+      set_field(key, val)
+    end
+  end
+
+  private def set_field(key, val)
+    case val
+    when Enumerable
+      ary = []
+      append_field_value(ary, val)
+      @header[key.downcase] = ary
+    else
+      val = val.to_s
+      if /[\r\n]/.match?(val)
+        raise ArgumentError, 'header field value cannnot include CR/LF'
+      end
       @header[key.downcase] = [val]
     end
   end
 
+  private def append_field_value(ary, val)
+    case val
+    when Enumerable
+      val.each{|x| append_field_value(ary, x)}
+    else
+      val = val.to_s
+      if /[\r\n]/.match?(val)
+        raise ArgumentError, 'header field value cannnot include CR/LF'
+      end
+      ary.push val
+    end
+  end
+
   # [Ruby 1.8.3]
   # Returns an array of header field strings corresponding to the
   # case-insensitive +key+.  This method allows you to get duplicated
Index: ruby_2_4/test/net/http/test_httpheader.rb
===================================================================
--- ruby_2_4/test/net/http/test_httpheader.rb	(revision 59782)
+++ ruby_2_4/test/net/http/test_httpheader.rb	(revision 59783)
@@ -40,6 +40,13 @@ class HTTPHeaderTest < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/net/http/test_httpheader.rb#L40
     @c['aaA'] = 'aaa'
     @c['AAa'] = 'aaa'
     assert_equal 2, @c.length
+
+    @c['aaa'] = ['aaa', ['bbb', [3]]]
+    assert_equal 2, @c.length
+    assert_equal ['aaa', 'bbb', '3'], @c.get_fields('aaa')
+
+    assert_raise(ArgumentError){ @c['foo'] = "a\nb" }
+    assert_raise(ArgumentError){ @c['foo'] = ["a\nb"] }
   end
 
   def test_AREF
@@ -65,6 +72,10 @@ class HTTPHeaderTest < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_4/test/net/http/test_httpheader.rb#L72
     @c.add_field 'My-Header', 'd, d'
     assert_equal 'a, b, c, d, d', @c['My-Header']
     assert_equal ['a', 'b', 'c', 'd, d'], @c.get_fields('My-Header')
+    assert_raise(ArgumentError){ @c.add_field 'My-Header', "d\nd" }
+    @c.add_field 'My-Header', ['e', ['f', 7]]
+    assert_equal 'a, b, c, d, d, e, f, 7', @c['My-Header']
+    assert_equal ['a', 'b', 'c', 'd, d', 'e', 'f', '7'], @c.get_fields('My-Header')
   end
 
   def test_get_fields
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 59782)
+++ ruby_2_4/version.h	(revision 59783)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.2"
 #define RUBY_RELEASE_DATE "2017-09-08"
-#define RUBY_PATCHLEVEL 182
+#define RUBY_PATCHLEVEL 183
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 9
Index: ruby_2_4
===================================================================
--- ruby_2_4	(revision 59782)
+++ ruby_2_4	(revision 59783)

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r59693,59695

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/