summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-18 06:49:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-01-18 06:49:46 +0000
commit67244d1a7007a9802ae4568426aae4fdd9309d60 (patch)
tree11b1264a22204520c92f60f8e5589b32c40f2bad
parent5ed5439af406426b0ab983825f2aa1dcfa9e31b3 (diff)
* lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
use inclusive range same as the header representation. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/net/http.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 32b3cb49cb..41ee3a56b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 18 15:49:42 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/net/http.rb (Net::HTTPHeader#{content_range,range_length}):
+ use inclusive range same as the header representation.
+
Mon Jan 18 03:59:57 2010 Akinori MUSHA <knu@iDaemons.org>
* ext/digest/digest.c (rb_digest_instance_hexdigest_bang): Fix
diff --git a/lib/net/http.rb b/lib/net/http.rb
index 1112d211c6..ebe51496f6 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1520,13 +1520,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".