aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/journey
diff options
context:
space:
mode:
authorTerence Sun <tsun1215@gmail.com>2015-01-31 19:15:42 -0800
committerTerence Sun <tsun1215@gmail.com>2015-02-08 12:03:56 -0500
commitb9c63b0aae7a7f9ddf32e155b11a51bd9c441857 (patch)
treeb258b2d5128ff0d29a571835815dc68380286e71 /actionpack/lib/action_dispatch/journey
parentde9a3748c436f849dd1877851115cd94663c2725 (diff)
downloadrails-b9c63b0aae7a7f9ddf32e155b11a51bd9c441857.tar.gz
rails-b9c63b0aae7a7f9ddf32e155b11a51bd9c441857.tar.bz2
rails-b9c63b0aae7a7f9ddf32e155b11a51bd9c441857.zip
Explicitly ignored wildcard verbs from head_routes
In match_head_routes, deleted the routes in which request.request_method was empty (matches all HTTP verbs) when responding to a HEAD request. This prevents catch-all routes (such as Racks) from intercepting the HEAD request. Fixes #18698
Diffstat (limited to 'actionpack/lib/action_dispatch/journey')
-rw-r--r--actionpack/lib/action_dispatch/journey/router.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index 2b036796ab..e9df984c86 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -121,6 +121,7 @@ module ActionDispatch
end
def match_head_routes(routes, req)
+ routes.delete_if { |route| route.verb == // }
head_routes = match_routes(routes, req)
if head_routes.empty?