diff options
author | Matthew Draper <matthew@trebex.net> | 2016-07-14 10:41:02 +0930 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-07-14 10:41:02 +0930 |
commit | a1ac08c2d9646e145d8f8f9734faa9a1d1f8ebbe (patch) | |
tree | 35b2d5385704fbf970daf3b882b3b9883d895ed7 /actionpack/lib/action_dispatch/middleware | |
parent | 853a041d5eab1afc8f08e7bb8bf6425cca95f6d3 (diff) | |
parent | 25c1461766745259d1d5be10fdcddc6e56d24f22 (diff) | |
download | rails-a1ac08c2d9646e145d8f8f9734faa9a1d1f8ebbe.tar.gz rails-a1ac08c2d9646e145d8f8f9734faa9a1d1f8ebbe.tar.bz2 rails-a1ac08c2d9646e145d8f8f9734faa9a1d1f8ebbe.zip |
Merge pull request #25798 from greysteil/dont-raise-unknown-http-method-low-in-stack
Don't raise ActionController::UnknownHttpMethod from ActionDispatch::Static
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/static.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/static.rb b/actionpack/lib/action_dispatch/middleware/static.rb index 2c5721dc22..4161c1d110 100644 --- a/actionpack/lib/action_dispatch/middleware/static.rb +++ b/actionpack/lib/action_dispatch/middleware/static.rb @@ -46,7 +46,7 @@ module ActionDispatch end def call(env) - serve ActionDispatch::Request.new env + serve(Rack::Request.new(env)) end def serve(request) @@ -82,7 +82,7 @@ module ActionDispatch 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) @@ -119,7 +119,7 @@ module ActionDispatch 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) |