use a request object to reduce string allocations and not know about ENV keys

2 files changed, 8 insertions, 7 deletions

diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index f38da4fdf6..5d3c2c3495 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -110,16 +110,17 @@ module ActionDispatch
     end
 
     def call(env)
-      case env['REQUEST_METHOD']
-      when 'GET', 'HEAD'
-        path = env['PATH_INFO'].chomp('/'.freeze)
+      req = ActionDispatch::Request.new env
+
+      if req.get? || req.head?
+        path = req.path_info.chomp('/'.freeze)
         if match = @file_handler.match?(path)
-          env['PATH_INFO'] = match
-          return @file_handler.call(env)
+          req.path_info = match
+          return @file_handler.call(req.env)
         end
       end
 
-      @app.call(env)
+      @app.call(req.env)
     end
   end
 end
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index 95971b3a0e..13dec8b618 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -156,7 +156,7 @@ module StaticTests
 
   def test_does_not_modify_path_info
     file_name = "/gzip/application-a71b3024f80aea3181c09774ca17e712.js"
-    env = {'PATH_INFO' => file_name, 'HTTP_ACCEPT_ENCODING' => 'gzip'}
+    env = {'PATH_INFO' => file_name, 'HTTP_ACCEPT_ENCODING' => 'gzip', "REQUEST_METHOD" => 'POST'}
     @app.call(env)
     assert_equal file_name, env['PATH_INFO']
   end