diff options
| -rw-r--r-- | lib/webrick/httpresponse.rb | 27 |
1 files changed, 3 insertions, 24 deletions
diff --git a/lib/webrick/httpresponse.rb b/lib/webrick/httpresponse.rb index eddd3388ed..82c53e60c7 100644 --- a/lib/webrick/httpresponse.rb +++ b/lib/webrick/httpresponse.rb @@ -410,9 +410,9 @@ module WEBrick buf.clear socket.write("0#{CRLF}#{CRLF}") else - size = @header['content-length'].to_i - _send_file(socket, @body, 0, size) - @sent_size = size + size = @header['content-length'] + size = size.to_i if size + @sent_size = IO.copy_stream(@body, socket, size) end ensure @body.close @@ -474,27 +474,6 @@ module WEBrick alias :<< :write end - def _send_file(output, input, offset, size) - while offset > 0 - sz = @buffer_size < size ? @buffer_size : size - buf = input.read(sz) - offset -= buf.bytesize - end - - if size == 0 - while buf = input.read(@buffer_size) - output.write(buf) - end - else - while size > 0 - sz = @buffer_size < size ? @buffer_size : size - buf = input.read(sz) - output.write(buf) - size -= buf.bytesize - end - end - end - # preserved for compatibility with some 3rd-party handlers def _write_data(socket, data) socket << data |