From 370fb8c7811704ed65384f599b52ac1b6d0c36c9 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Wed, 5 Jan 2011 18:01:36 -0800 Subject: event_machine: refactor async.callback for keepalive async.callback will be useful with Coolio (and more!) soon, so ensure it works as well as the rest of Rainbows! --- lib/rainbows/event_machine/client.rb | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'lib/rainbows/event_machine/client.rb') diff --git a/lib/rainbows/event_machine/client.rb b/lib/rainbows/event_machine/client.rb index 5abdc3b..22e5360 100644 --- a/lib/rainbows/event_machine/client.rb +++ b/lib/rainbows/event_machine/client.rb @@ -48,18 +48,7 @@ class Rainbows::EventMachine::Client < EM::Connection # second (pipelined) request could be a stuck behind a # long-running async response (status.nil? || -1 == status) and return @state = :close - - if @hp.next? - @state = :headers - write_response(status, headers, body, true) - if @buf.empty? - set_comm_inactivity_timeout(Rainbows.keepalive_timeout) - elsif @body.nil? - EM.next_tick { receive_data(nil) } - end - else - write_response(status, headers, body, false) - end + write_response(status, headers, body, @hp.next?) end def next! -- cgit v1.2.3-24-ge0c7