From b1315983056f91467b336aeb426759debc006a4e Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sun, 6 Jun 2010 02:14:58 +0000 Subject: centralize body => IO conversion logic Since EventMachine and Rev shared the same logic for optimizing and avoiding extra file opens for IO/File-ish response bodies, so centralize that. For Ruby 1.9 users, we've also enabled this logic so ThreadPool, ThreadSpawn, WriterThreadPool, and WriterThreadSpawn can take advantage of Rainbows::DevFdResponse-generated bodies while proxying sockets. --- lib/rainbows/event_machine.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'lib/rainbows/event_machine.rb') diff --git a/lib/rainbows/event_machine.rb b/lib/rainbows/event_machine.rb index b19bdec..12d9e5e 100644 --- a/lib/rainbows/event_machine.rb +++ b/lib/rainbows/event_machine.rb @@ -112,18 +112,15 @@ module Rainbows end headers = Rack::Utils::HeaderHash.new(response[1]) - path = body.to_path - io = body.to_io if body.respond_to?(:to_io) - io ||= IO.new($1.to_i) if path =~ %r{\A/dev/fd/(\d+)\z} - io ||= File.open(path, 'rb') # could be a named pipe - + io = Rainbows.body_to_io(body) st = io.stat + if st.file? headers.delete('Transfer-Encoding') headers['Content-Length'] ||= st.size.to_s response = [ response.first, headers.to_hash, [] ] HttpResponse.write(self, response, out) - stream = stream_file_data(path) + stream = stream_file_data(body.to_path) stream.callback { quit } unless alive elsif st.socket? || st.pipe? do_chunk = !!(headers['Transfer-Encoding'] =~ %r{\Achunked\z}i) -- cgit v1.2.3-24-ge0c7