diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-16 06:57:47 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-06-16 06:57:47 +0000 |
commit | 836271c28be00a3ef8bc60762369ce99da0169e5 (patch) | |
tree | 3c4ce80704abac09a0ebaf5b53927e92f5adedee /lib | |
parent | a0efdbbb6b35efb2581e3a7dcdef3abca2dcd3dd (diff) |
merge revision(s) 26344,27367:
* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
use inclusive range same as the header representation.
* test/webrick/utils.rb (TestWEBrick#start_server): add log for
test_filehandler.rb
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@28336 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/net/http.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/net/http.rb b/lib/net/http.rb index 0f72b7ae9f..cd4d51071f 100644 --- a/lib/net/http.rb +++ b/lib/net/http.rb @@ -1366,13 +1366,13 @@ module Net #:nodoc: return nil unless @header['content-range'] m = %r<bytes\s+(\d+)-(\d+)/(\d+|\*)>i.match(self['Content-Range']) or raise HTTPHeaderSyntaxError, 'wrong Content-Range format' - m[1].to_i .. m[2].to_i + 1 + m[1].to_i .. m[2].to_i end # The length of the range represented in Content-Range: header. def range_length r = content_range() or return nil - r.end - r.begin + r.end - r.begin + 1 end # Returns a content type string such as "text/html". |