diff options
-rw-r--r-- | lib/net/http/header.rb | 4 | ||||
-rw-r--r-- | test/net/http/test_httpheader.rb | 9 |
2 files changed, 8 insertions, 5 deletions
diff --git a/lib/net/http/header.rb b/lib/net/http/header.rb index 4777ebf82a..8f3206d363 100644 --- a/lib/net/http/header.rb +++ b/lib/net/http/header.rb @@ -76,7 +76,7 @@ module Net::HTTPHeader @header[key.downcase] = ary else val = val.to_s - if /[\r\n]/.match?(val) + if /[\r\n]/n.match?(val.b) raise ArgumentError, 'header field value cannnot include CR/LF' end @header[key.downcase] = [val] @@ -89,7 +89,7 @@ module Net::HTTPHeader val.each{|x| append_field_value(ary, x)} else val = val.to_s - if /[\r\n]/.match?(val) + if /[\r\n]/n.match?(val.b) raise ArgumentError, 'header field value cannnot include CR/LF' end ary.push val diff --git a/test/net/http/test_httpheader.rb b/test/net/http/test_httpheader.rb index 0a2c57dcb8..c9b8b3c406 100644 --- a/test/net/http/test_httpheader.rb +++ b/test/net/http/test_httpheader.rb @@ -45,6 +45,9 @@ class HTTPHeaderTest < Test::Unit::TestCase assert_equal 2, @c.length assert_equal ['aaa', 'bbb', '3'], @c.get_fields('aaa') + @c['aaa'] = "aaa\xff" + assert_equal 2, @c.length + assert_raise(ArgumentError){ @c['foo'] = "a\nb" } assert_raise(ArgumentError){ @c['foo'] = ["a\nb"] } end @@ -73,9 +76,9 @@ class HTTPHeaderTest < Test::Unit::TestCase 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') + @c.add_field 'My-Header', ['e', ["\xff", 7]] + assert_equal "a, b, c, d, d, e, \xff, 7", @c['My-Header'] + assert_equal ['a', 'b', 'c', 'd, d', 'e', "\xff", '7'], @c.get_fields('My-Header') end def test_get_fields |