Enable cleanup of Tempfiles from multipart form data by default

2 files changed, 9 insertions, 2 deletions

diff --git a/lib/rack/server.rb b/lib/rack/server.rb
index efd89c27..d51a95eb 100644
--- a/lib/rack/server.rb
+++ b/lib/rack/server.rb
@@ -217,14 +217,16 @@ module Rack
           "deployment" => [
             [Rack::ContentLength],
             [Rack::Chunked],
-            logging_middleware
+            logging_middleware,
+            [Rack::TempfileReaper]
           ],
           "development" => [
             [Rack::ContentLength],
             [Rack::Chunked],
             logging_middleware,
             [Rack::ShowExceptions],
-            [Rack::Lint]
+            [Rack::Lint],
+            [Rack::TempfileReaper]
           ],
           "none" => []
         }
diff --git a/test/spec_server.rb b/test/spec_server.rb
index 59391681..9a81875a 100644
--- a/test/spec_server.rb
+++ b/test/spec_server.rb
@@ -40,6 +40,11 @@ describe Rack::Server do
     server.default_middleware_by_environment['none'].flatten.should.not.include(Rack::ShowExceptions)
   end
 
+  should "include Rack::TempfileReaper in deployment environment" do
+    server = Rack::Server.new(:app => 'foo')
+    server.middleware['deployment'].flatten.should.include(Rack::TempfileReaper)
+  end
+
   should "support CGI" do
     begin
       o, ENV["REQUEST_METHOD"] = ENV["REQUEST_METHOD"], 'foo'