From b2deafb27774ecf3c931294c5dd10e7fd1831aba Mon Sep 17 00:00:00 2001
From: aamine <aamine@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 17 Feb 2001 20:40:50 +0000
Subject: aamine * lib/net/http.rb: Response#range_length was not debugged.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@1195 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/net/http.rb | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

(limited to 'lib/net/http.rb')

diff --git a/lib/net/http.rb b/lib/net/http.rb
index 4c39bb74ba..402987ca9c 100644
--- a/lib/net/http.rb
+++ b/lib/net/http.rb
@@ -1004,21 +1004,17 @@ module Net
      end
 
     def range_length
-      if @header.key? 'content-range' then
-        m = %r<bytes\s+(\d+)-(\d+)/\d+>.match( @header['content-range'] )
-        unless m then
-          raise HTTPBadResponse, 'wrong Content-Range format'
-        end
-        l = m[2].to_i
-        u = m[1].to_i
-        if l > u then
-          nil
-        else
-          u - l
-        end
-      else
-        nil
-      end
+      s = @header['content-range']
+      s or return nil
+
+      m = %r<bytes\s+(\d+)-(\d+)/(?:\d+|\*)>.match( s )
+      m or raise HTTPBadResponse, 'wrong Content-Range format'
+
+      low = m[1].to_i
+      up  = m[2].to_i
+      return nil if low > up
+
+      up - low + 1
     end
 
     def stream_check
@@ -1035,7 +1031,7 @@ module Net
       if block then
         ::Net::NetPrivate::ReadAdapter.new block
       else
-        dest or ''
+        dest || ''
       end
     end
 
-- 
cgit v1.2.3