Make HttpRequest object (and temp files) persistent

This will help prevent TMPDIR from becoming bloated when
handling thousands of large uploads a day.  This is a problem in
many UNIX filesystems (including ext3): names of entries never
expire even after files are gone and the only way to clear it is
to get rid of the directory itself.

1 files changed, 4 insertions, 6 deletions

diff --git a/lib/unicorn.rb b/lib/unicorn.rb
index 1cc814a..b91950f 100644
--- a/lib/unicorn.rb
+++ b/lib/unicorn.rb
@@ -120,11 +120,9 @@ module Unicorn
             params[Const::REMOTE_ADDR] = client.peeraddr.last
 
             # Select handlers that want more detailed request notification
-            request = HttpRequest.new(params, client, logger)
-
-            # in the case of large file uploads the user could close the socket, so skip those requests
-            break if request.body == nil  # nil signals from HttpRequest::initialize that the request was aborted
-            app_response = @app.call(request.env)
+            request = $http_request ||= HttpRequest.new(logger)
+            env = request.consume(params, client) or break
+            app_response = @app.call(env)
             HttpResponse.send(client, app_response)
           break #done
           else
@@ -157,7 +155,7 @@ module Unicorn
           logger.error "Client error: #{e.inspect}"
           logger.error e.backtrace.join("\n")
         end
-        request.body.close! if request and request.body.class == Tempfile
+        request.reset! if request
       end
     end