From 3ba0abdb157b490644264c3bc45cb8fbc1e1f46b Mon Sep 17 00:00:00 2001 From: naruse Date: Wed, 23 May 2012 13:09:26 +0000 Subject: * lib/net/http/header.rb (Net::HTTPHeader#range): fix broken parser of HTTP Range request. Old one can't parse invalid specs and multiple specs correctly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35764 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- test/net/http/test_httpheader.rb | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) (limited to 'test/net') diff --git a/test/net/http/test_httpheader.rb b/test/net/http/test_httpheader.rb index 379c9bd1ad..062387189d 100644 --- a/test/net/http/test_httpheader.rb +++ b/test/net/http/test_httpheader.rb @@ -156,15 +156,32 @@ class HTTPHeaderTest < Test::Unit::TestCase end def test_range - try_range(1..5, '1-5') - try_range(234..567, '234-567') - try_range(-5..-1, '-5') - try_range(1..-1, '1-') + try_range([1..5], '1-5') + try_invalid_range('5-1') + try_range([234..567], '234-567') + try_range([-5..-1], '-5') + try_invalid_range('-0') + try_range([1..-1], '1-') + try_range([0..0,-1..-1], '0-0,-1') + try_range([1..2, 3..4], '1-2,3-4') + try_range([1..2, 3..4], '1-2 , 3-4') + try_range([1..2, 1..4], '1-2,1-4') + + try_invalid_range('invalid') + try_invalid_range(' 12-') + try_invalid_range('12- ') + try_invalid_range('123-abc') + try_invalid_range('abc-123') end def try_range(r, s) @c['range'] = "bytes=#{s}" - assert_equal r, Array(@c.range)[0] + assert_equal r, @c.range + end + + def try_invalid_range(s) + @c['range'] = "bytes=#{s}" + assert_raise(Net::HTTPHeaderSyntaxError, s){ @c.range } end def test_range= -- cgit v1.2.3