1 files changed, 6 insertions, 4 deletions
diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb
index 3e3a424df3..e4b8d5993e 100644
--- a/actionpack/lib/action_dispatch/routing/route_set.rb
+++ b/actionpack/lib/action_dispatch/routing/route_set.rb
@@ -27,8 +27,10 @@ module ActionDispatch
         def dispatcher?; true; end
 
         def serve(req)
-          params = req.path_parameters
-          dispatch(controller(req), params[:action], req)
+          params     = req.path_parameters
+          controller = controller req
+          res        = controller.make_response! req
+          dispatch(controller, params[:action], req, res)
         rescue NameError => e
           if @raise_on_name_error
             raise ActionController::RoutingError, e.message, e.backtrace
@@ -43,8 +45,8 @@ module ActionDispatch
           req.controller_class
         end
 
-        def dispatch(controller, action, req)
-          controller.dispatch(action, req)
+        def dispatch(controller, action, req, res)
+          controller.dispatch(action, req, res)
         end
       end