From ac05e7035e1946b78ce4679548db7680aa01734c Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 17 Aug 2010 08:35:03 +0000 Subject: avoid EBADF with certain middlewares when proxying First off we use an FD_MAP to avoid creating redundant IO objects which map to the same FD. When that doesn't work, we'll fall back to trapping Errno::EBADF and IOError where appropriate. --- lib/rainbows/dev_fd_response.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/rainbows/dev_fd_response.rb') diff --git a/lib/rainbows/dev_fd_response.rb b/lib/rainbows/dev_fd_response.rb index 637bcc2..7f70b8e 100644 --- a/lib/rainbows/dev_fd_response.rb +++ b/lib/rainbows/dev_fd_response.rb @@ -14,7 +14,8 @@ class Rainbows::DevFdResponse < Struct.new(:app) # :stopdoc: - # + FD_MAP = Rainbows::FD_MAP + # make this a no-op under Rubinius, it's pointless anyways # since Rubinius doesn't have IO.copy_stream def self.new(app) @@ -37,6 +38,7 @@ class Rainbows::DevFdResponse < Struct.new(:app) headers = HeaderHash.new(headers) st = io.stat fileno = io.fileno + FD_MAP[fileno] = io if st.file? headers['Content-Length'] ||= st.size.to_s headers.delete('Transfer-Encoding') -- cgit v1.2.3-24-ge0c7