diff options
Diffstat (limited to 'lib/rainbows/rev')
| -rw-r--r-- | lib/rainbows/rev/client.rb | 3 | ||||
| -rw-r--r-- | lib/rainbows/rev/sendfile.rb | 12 |
2 files changed, 3 insertions, 12 deletions
diff --git a/lib/rainbows/rev/client.rb b/lib/rainbows/rev/client.rb index 4d1aaec..502615e 100644 --- a/lib/rainbows/rev/client.rb +++ b/lib/rainbows/rev/client.rb @@ -8,6 +8,7 @@ module Rainbows include Rainbows::ByteSlice include Rainbows::EvCore G = Rainbows::G + F = Rainbows::StreamFile def initialize(io) CONN[self] = false @@ -80,7 +81,7 @@ module Rainbows if st.file? write(response_header(status, headers)) if headers - return defer_body(to_sendfile(io)) + return defer_body(F.new(0, io, body)) elsif st.socket? || st.pipe? return stream_response(status, headers, io, body) end diff --git a/lib/rainbows/rev/sendfile.rb b/lib/rainbows/rev/sendfile.rb index 414cfa1..9f421f1 100644 --- a/lib/rainbows/rev/sendfile.rb +++ b/lib/rainbows/rev/sendfile.rb @@ -2,12 +2,6 @@ # :enddoc: module Rainbows::Rev::Sendfile if IO.method_defined?(:sendfile_nonblock) - F = Rainbows::StreamFile - - def to_sendfile(io) - F[0, io] - end - def rev_sendfile(body) body.offset += @_io.sendfile_nonblock(body, body.offset, 0x10000) enable_write_watcher @@ -15,12 +9,8 @@ module Rainbows::Rev::Sendfile enable_write_watcher end else - def to_sendfile(io) - io - end - def rev_sendfile(body) - write(body.sysread(0x4000)) + write(body.to_io.sysread(0x4000)) end end end |