diff options
| -rw-r--r-- | lib/webrick/httpresponse.rb | 12 | ||||
| -rw-r--r-- | lib/webrick/httpservlet/filehandler.rb | 9 | ||||
| -rw-r--r-- | test/webrick/test_filehandler.rb | 14 |
3 files changed, 14 insertions, 21 deletions
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb index 82c53e60c7..5b71facab6 100644 --- a/lib/webrick/httpresponse.rb +++ b/lib/webrick/httpresponse.rb @@ -410,9 +410,15 @@ module WEBrick buf.clear socket.write("0#{CRLF}#{CRLF}") else - size = @header['content-length'] - size = size.to_i if size - @sent_size = IO.copy_stream(@body, socket, size) + if %r{\Abytes (\d+)-(\d+)/\d+\z} =~ @header['content-range'] + offset = $1.to_i + size = $2.to_i - offset + 1 + else + offset = nil + size = @header['content-length'] + size = size.to_i if size + end + @sent_size = IO.copy_stream(@body, socket, size, offset) end ensure @body.close diff --git a/lib/webrick/httpservlet/filehandler.rb b/lib/webrick/httpservlet/filehandler.rb index 2c02d0ffe7..c910044742 100644 --- a/lib/webrick/httpservlet/filehandler.rb +++ b/lib/webrick/httpservlet/filehandler.rb @@ -116,17 +116,10 @@ module WEBrick elsif range = ranges[0] first, last = prepare_range(range, filesize) raise HTTPStatus::RequestRangeNotSatisfiable if first < 0 - if last == filesize - 1 - content = io.dup - content.pos = first - else - io.pos = first - content = io.read(last-first+1) - end res['content-type'] = mtype res['content-range'] = "bytes #{first}-#{last}/#{filesize}" res['content-length'] = last - first + 1 - res.body = content + res.body = io.dup else raise HTTPStatus::BadRequest end diff --git a/test/webrick/test_filehandler.rb b/test/webrick/test_filehandler.rb index 3fba1ec5e2..ac97c15561 100644 --- a/test/webrick/test_filehandler.rb +++ b/test/webrick/test_filehandler.rb @@ -20,16 +20,10 @@ class WEBrick::TestFileHandler < Test::Unit::TestCase end def get_res_body(res) - body = res.body - if defined? body.read - begin - body.read - ensure - body.close - end - else - body - end + sio = StringIO.new + sio.binmode + res.send_body(sio) + sio.string end def make_range_request(range_spec) |