1 files changed, 13 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/request.rb b/actionpack/lib/action_dispatch/http/request.rb
index de28cd0998..1189111f20 100644
--- a/actionpack/lib/action_dispatch/http/request.rb
+++ b/actionpack/lib/action_dispatch/http/request.rb
@@ -67,6 +67,18 @@ module ActionDispatch
       end
     end
 
+    def controller_class
+      check_path_parameters!
+      params = path_parameters
+      controller_param = params[:controller].underscore if params.key?(:controller)
+      params[:action] ||= 'index'
+
+      yield unless controller_param
+
+      const_name = "#{controller_param.camelize}Controller"
+      ActiveSupport::Dependencies.constantize(const_name)
+    end
+
     def key?(key)
       @env.key?(key)
     end
@@ -170,7 +182,7 @@ module ActionDispatch
     #
     #   request.headers["Content-Type"] # => "text/plain"
     def headers
-      @headers ||= Http::Headers.new(@env)
+      @headers ||= Http::Headers.new(self)
     end
 
     # Returns a +String+ with the last requested path including their params.