diff options
Diffstat (limited to 'lib/unicorn')
| -rw-r--r-- | lib/unicorn/tee_input.rb | 9 | ||||
| -rw-r--r-- | lib/unicorn/tmpio.rb | 3 |
2 files changed, 11 insertions, 1 deletions
diff --git a/lib/unicorn/tee_input.rb b/lib/unicorn/tee_input.rb index 637c583..3c6d18a 100644 --- a/lib/unicorn/tee_input.rb +++ b/lib/unicorn/tee_input.rb @@ -28,13 +28,20 @@ class Unicorn::TeeInput < Unicorn::StreamInput @@client_body_buffer_size end + # for Rack::TempfileReaper in rack 1.6+ + def new_tmpio # :nodoc: + tmpio = Unicorn::TmpIO.new + (@parser.env['rack.tempfiles'] ||= []) << tmpio + tmpio + end + # Initializes a new TeeInput object. You normally do not have to call # this unless you are writing an HTTP server. def initialize(socket, request) @len = request.content_length super @tmp = @len && @len <= @@client_body_buffer_size ? - StringIO.new("") : Unicorn::TmpIO.new + StringIO.new("") : new_tmpio end # :call-seq: diff --git a/lib/unicorn/tmpio.rb b/lib/unicorn/tmpio.rb index 2da05a2..dcdf9da 100644 --- a/lib/unicorn/tmpio.rb +++ b/lib/unicorn/tmpio.rb @@ -26,4 +26,7 @@ class Unicorn::TmpIO < File def size stat.size end unless File.method_defined?(:size) + + # pretend we're Tempfile for Rack::TempfileReaper + alias close! close end |