From 60039518e03b0f1a0f530eefe008ebf72c55afe4 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Mon, 19 Jul 2010 10:10:06 +0000 Subject: ensure file response bodies are properly closed Middlewares like Clogger may wrap Rack::File responses with another body that responds to to_path and still rely on #close to trigger an action (writing out the log file). --- lib/rainbows/stream_file.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/rainbows/stream_file.rb') diff --git a/lib/rainbows/stream_file.rb b/lib/rainbows/stream_file.rb index f533f18..dec58b0 100644 --- a/lib/rainbows/stream_file.rb +++ b/lib/rainbows/stream_file.rb @@ -5,10 +5,11 @@ # models. We always maintain our own file offsets in userspace because # because sendfile() implementations offer pread()-like idempotency for # concurrency (multiple clients can read the same underlying file handle). -class Rainbows::StreamFile < Struct.new(:offset, :to_io) +class Rainbows::StreamFile < Struct.new(:offset, :to_io, :body) def close - to_io.close + body.close if body.respond_to?(:close) + to_io.close unless to_io.closed? self.to_io = nil end end -- cgit v1.2.3-24-ge0c7