3 files changed, 56 insertions, 60 deletions

diff --git a/actionpack/lib/action_dispatch/journey/parser.rb b/actionpack/lib/action_dispatch/journey/parser.rb
index d129ba7e16..9012297400 100644
--- a/actionpack/lib/action_dispatch/journey/parser.rb
+++ b/actionpack/lib/action_dispatch/journey/parser.rb
@@ -86,7 +86,7 @@ racc_token_table = {
 
 racc_nt_base = 10
 
-racc_use_result_var = true
+racc_use_result_var = false
 
 Racc_arg = [
   racc_action_table,
@@ -133,14 +133,12 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-def _reduce_1(val, _values, result)
- result = Cat.new(val.first, val.last) 
-    result
+def _reduce_1(val, _values)
+ Cat.new(val.first, val.last)
 end
 
-def _reduce_2(val, _values, result)
- result = val.first 
-    result
+def _reduce_2(val, _values)
+ val.first
 end
 
 # reduce 3 omitted
@@ -151,24 +149,20 @@ end
 
 # reduce 6 omitted
 
-def _reduce_7(val, _values, result)
- result = Group.new(val[1]) 
-    result
+def _reduce_7(val, _values)
+ Group.new(val[1])
 end
 
-def _reduce_8(val, _values, result)
- result = Or.new([val.first, val.last]) 
-    result
+def _reduce_8(val, _values)
+ Or.new([val.first, val.last])
 end
 
-def _reduce_9(val, _values, result)
- result = Or.new([val.first, val.last]) 
-    result
+def _reduce_9(val, _values)
+ Or.new([val.first, val.last])
 end
 
-def _reduce_10(val, _values, result)
- result = Star.new(Symbol.new(val.last)) 
-    result
+def _reduce_10(val, _values)
+ Star.new(Symbol.new(val.last))
 end
 
 # reduce 11 omitted
@@ -179,27 +173,23 @@ end
 
 # reduce 14 omitted
 
-def _reduce_15(val, _values, result)
- result = Slash.new('/') 
-    result
+def _reduce_15(val, _values)
+ Slash.new('/')
 end
 
-def _reduce_16(val, _values, result)
- result = Symbol.new(val.first) 
-    result
+def _reduce_16(val, _values)
+ Symbol.new(val.first)
 end
 
-def _reduce_17(val, _values, result)
- result = Literal.new(val.first) 
-    result
+def _reduce_17(val, _values)
+ Literal.new(val.first)
 end
 
-def _reduce_18(val, _values, result)
- result = Dot.new(val.first) 
-    result
+def _reduce_18(val, _values)
+ Dot.new(val.first)
 end
 
-def _reduce_none(val, _values, result)
+def _reduce_none(val, _values)
   val[0]
 end
 
diff --git a/actionpack/lib/action_dispatch/journey/parser.y b/actionpack/lib/action_dispatch/journey/parser.y
index 0ead222551..d3f7c4d765 100644
--- a/actionpack/lib/action_dispatch/journey/parser.y
+++ b/actionpack/lib/action_dispatch/journey/parser.y
@@ -1,11 +1,11 @@
 class ActionDispatch::Journey::Parser
-
+  options no_result_var
 token SLASH LITERAL SYMBOL LPAREN RPAREN DOT STAR OR
 
 rule
   expressions
-    : expression expressions  { result = Cat.new(val.first, val.last) }
-    | expression              { result = val.first }
+    : expression expressions  { Cat.new(val.first, val.last) }
+    | expression              { val.first }
     | or
     ;
   expression
@@ -14,14 +14,14 @@ rule
     | star
     ;
   group
-    : LPAREN expressions RPAREN { result = Group.new(val[1]) }
+    : LPAREN expressions RPAREN { Group.new(val[1]) }
     ;
   or
-    : expression OR expression { result = Or.new([val.first, val.last]) }
-    | expression OR or { result = Or.new([val.first, val.last]) }
+    : expression OR expression { Or.new([val.first, val.last]) }
+    | expression OR or { Or.new([val.first, val.last]) }
     ;
   star
-    : STAR       { result = Star.new(Symbol.new(val.last)) }
+    : STAR       { Star.new(Symbol.new(val.last)) }
     ;
   terminal
     : symbol
@@ -30,16 +30,16 @@ rule
     | dot
     ;
   slash
-    : SLASH              { result = Slash.new('/') }
+    : SLASH              { Slash.new('/') }
     ;
   symbol
-    : SYMBOL             { result = Symbol.new(val.first) }
+    : SYMBOL             { Symbol.new(val.first) }
     ;
   literal
-    : LITERAL            { result = Literal.new(val.first) }
+    : LITERAL            { Literal.new(val.first) }
     ;
   dot
-    : DOT                { result = Dot.new(val.first) }
+    : DOT                { Dot.new(val.first) }
     ;
 
 end
diff --git a/actionpack/lib/action_dispatch/journey/router.rb b/actionpack/lib/action_dispatch/journey/router.rb
index 21817b374c..9131b65380 100644
--- a/actionpack/lib/action_dispatch/journey/router.rb
+++ b/actionpack/lib/action_dispatch/journey/router.rb
@@ -101,11 +101,13 @@ module ActionDispatch
             r.path.match(req.path_info)
           }
 
-          if req.env["REQUEST_METHOD"] === "HEAD"
-            routes.concat get_routes_as_head(routes)
-          end
+          routes =
+            if req.request_method == "HEAD"
+              match_head_routes(routes, req)
+            else
+              match_routes(routes, req)
+            end
 
-          routes.select! { |r| r.matches?(req) }
           routes.sort_by!(&:precedence)
 
           routes.map! { |r|
@@ -118,19 +120,23 @@ module ActionDispatch
           }
         end
 
-        def get_routes_as_head(routes)
-          precedence = (routes.map(&:precedence).max || 0) + 1
-          routes.select { |r|
-            r.verb === "GET" && !(r.verb === "HEAD")
-          }.map! { |r|
-            Route.new(r.name,
-                      r.app,
-                      r.path,
-                      r.conditions.merge(request_method: "HEAD"),
-                      r.defaults).tap do |route|
-                        route.precedence = r.precedence + precedence
-                      end
-          }
+        def match_head_routes(routes, req)
+          head_routes = match_routes(routes, req)
+
+          if head_routes.empty?
+            begin
+              req.request_method = "GET"
+              match_routes(routes, req)
+            ensure
+              req.request_method = "HEAD"
+            end
+          else
+            head_routes
+          end
+        end
+
+        def match_routes(routes, req)
+          routes.select { |r| r.matches?(req) }
         end
     end
   end