From ffa13e9d4fdd0684844ad72000c6e949d565dd35 Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Thu, 14 Jul 2016 10:41:02 +0930
Subject: [PATCH] Merge pull request #25798 from
 greysteil/dont-raise-unknown-http-method-low-in-stack

Don't raise ActionController::UnknownHttpMethod from ActionDispatch::Static
---
 actionpack/CHANGELOG.md                             | 9 +++++++++
 actionpack/lib/action_dispatch/middleware/static.rb | 6 +++---
 actionpack/test/dispatch/static_test.rb             | 9 +++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 6cd7041a232e4..e32db7848fc7f 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,3 +1,12 @@
+*   Don't raise ActionController::UnknownHttpMethod from ActionDispatch::Static
+
+    Pass `Rack::Request` objects to `ActionDispatch::FileHandler` to avoid it
+    raising `ActionController::UnknownHttpMethod`. If an unknown method is
+    passed, it should exception higher in the stack instead, once we've had a
+    chance to define exception handling behaviour.
+
+    *Grey Baker*
+
 *   Handle `Rack::QueryParser` errors in `ActionDispatch::ExceptionWrapper`
 
     Updated `ActionDispatch::ExceptionWrapper` to handle the Rack 2.0 namespace
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb
index 41c220236a1bd..8827f46489566 100644
--- a/actionpack/lib/action_dispatch/middleware/static.rb
+++ b/actionpack/lib/action_dispatch/middleware/static.rb
@@ -46,7 +46,7 @@ def match?(path)
     end
 
     def call(env)
-      serve ActionDispatch::Request.new env
+      serve(Rack::Request.new(env))
     end
 
     def serve(request)
@@ -82,7 +82,7 @@ def content_type(path)
       end
 
       def gzip_encoding_accepted?(request)
-        request.accept_encoding =~ /\bgzip\b/i
+        request.accept_encoding.any? { |enc, quality| enc =~ /\bgzip\b/i }
       end
 
       def gzip_file_path(path)
@@ -123,7 +123,7 @@ def initialize(app, path, deprecated_cache_control = :not_set, index: 'index', h
     end
 
     def call(env)
-      req = ActionDispatch::Request.new env
+      req = Rack::Request.new env
 
       if req.get? || req.head?
         path = req.path_info.chomp('/'.freeze)
diff --git a/actionpack/test/dispatch/static_test.rb b/actionpack/test/dispatch/static_test.rb
index ea8b5e904e5e5..1036758f3551a 100644
--- a/actionpack/test/dispatch/static_test.rb
+++ b/actionpack/test/dispatch/static_test.rb
@@ -160,6 +160,9 @@ def test_serves_gzip_files_when_header_set
     response  = get(file_name, 'HTTP_ACCEPT_ENCODING' => 'GZIP')
     assert_gzip  file_name, response
 
+    response  = get(file_name, 'HTTP_ACCEPT_ENCODING' => 'compress;q=0.5, gzip;q=1.0')
+    assert_gzip  file_name, response
+
     response  = get(file_name, 'HTTP_ACCEPT_ENCODING' => '')
     assert_not_equal 'gzip', response.headers["Content-Encoding"]
   end
@@ -205,6 +208,12 @@ def test_serves_files_with_headers
     assert_equal "I'm a teapot",           response.headers["X-Custom-Header"]
   end
 
+  def test_ignores_unknown_http_methods
+    app = ActionDispatch::Static.new(DummyApp, @root)
+
+    assert_nothing_raised { Rack::MockRequest.new(app).request("BAD_METHOD", "/foo/bar.html") }
+  end
+
   # Windows doesn't allow \ / : * ? " < > | in filenames
   unless RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
     def test_serves_static_file_with_colon