Merge pull request #19431 from hmarr/head-routing

Respect routing precedence for HEAD requests

2 files changed, 4 insertions, 4 deletions

diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index cc4bd6105d..b84aad8eb6 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -121,7 +121,8 @@ module ActionDispatch
         end
 
         def match_head_routes(routes, req)
-          head_routes = match_routes(routes, req)
+          verb_specific_routes = routes.reject { |route| route.verb == // }
+          head_routes = match_routes(verb_specific_routes, req)
 
           if head_routes.empty?
             begin
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 77f86b7a62..26b8636c2f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -3567,12 +3567,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       mount lambda { |env| [200, {}, [env['REQUEST_METHOD']]] }, at: '/'
     end
 
-    # TODO: HEAD request should match `get /home` rather than the
+    # HEAD request should match `get /home` rather than the
     # lower-precedence Rack app mounted at `/`.
     head '/home'
     assert_response :ok
-    #assert_equal 'test#index', @response.body
-    assert_equal 'HEAD', @response.body
+    assert_equal 'test#index', @response.body
 
     # But the Rack app can still respond to its own HEAD requests.
     head '/foobar'