From 1562a19a021a72a78ba495328d2d37ba0dc83b8c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 7 Dec 2010 12:11:51 -0800 Subject: rev+revactor: fix LARGE pipelined uploads Large uploads behave differently with regard to buffering, and there were bugs in the way the Rev and Revactor backends handled uploads. --- lib/rainbows/ev_core.rb | 2 ++ lib/rainbows/revactor.rb | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/rainbows/ev_core.rb b/lib/rainbows/ev_core.rb index 8241584..46fdedf 100644 --- a/lib/rainbows/ev_core.rb +++ b/lib/rainbows/ev_core.rb @@ -86,6 +86,8 @@ module Rainbows::EvCore @hp.filter_body(@buf2, @buf << data) @input << @buf2 on_read("") + else + want_more end when :trailers if @hp.trailers(@env, @buf << data) diff --git a/lib/rainbows/revactor.rb b/lib/rainbows/revactor.rb index 59f37b0..51f6c1f 100644 --- a/lib/rainbows/revactor.rb +++ b/lib/rainbows/revactor.rb @@ -46,13 +46,14 @@ module Rainbows::Revactor alive = false begin + ts = nil until env = hp.parse buf << client.read(*rd_args) end env[CLIENT_IO] = client env[RACK_INPUT] = 0 == hp.content_length ? - NULL_IO : Unicorn::TeeInput.new(TeeSocket.new(client), hp) + NULL_IO : Unicorn::TeeInput.new(ts = TeeSocket.new(client), hp) env[REMOTE_ADDR] = remote_addr status, headers, body = app.call(env.update(RACK_DEFAULTS)) @@ -68,6 +69,7 @@ module Rainbows::Revactor alive = hp.next? && G.alive && G.kato > 0 headers[CONNECTION] = alive ? KEEP_ALIVE : CLOSE client.write(response_header(status, headers)) + alive && ts and buf << ts.leftover end write_body(client, body, range) end while alive @@ -155,6 +157,10 @@ module Rainbows::Revactor @socket, @rbuf = socket, IO::Buffer.new end + def leftover + @rbuf.read + end + # Revactor socket reads always return an unspecified amount, # sometimes too much def kgio_read(length, dst = "") -- cgit v1.2.3-24-ge0c7