Merge branch 'master' of git://github.com/rails/rails

3 files changed, 7 insertions, 6 deletions

diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index 4297d9bbf6..8611d0d3c3 100644
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -13,6 +13,7 @@ module ActionController
     MODULES = [
       AbstractController::Layouts,
       AbstractController::Translation,
+      AbstractController::AssetPaths,
 
       Helpers,
       HideActions,
@@ -66,8 +67,7 @@ module ActionController
       @subclasses ||= []
     end
 
-    # TODO Move this to the appropriate module
-    config_accessor :assets_dir, :asset_path, :javascripts_dir, :stylesheets_dir
+    config_accessor :asset_host, :asset_path
 
     ActiveSupport.run_load_hooks(:action_controller, self)
   end
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb
index 060117756e..508ea6e2b7 100644
--- a/actionpack/lib/action_controller/metal/rack_delegation.rb
+++ b/actionpack/lib/action_controller/metal/rack_delegation.rb
@@ -8,10 +8,10 @@ module ActionController
     delegate :headers, :status=, :location=, :content_type=,
              :status, :location, :content_type, :to => "@_response"
 
-    def dispatch(action, request)
-      @_response = ActionDispatch::Response.new
-      @_response.request = request
-      super
+    def dispatch(action, request, response = ActionDispatch::Response.new)
+      @_response ||= response
+      @_response.request ||= request
+      super(action, request)
     end
 
     def params
diff --git a/actionpack/lib/action_controller/metal/request_forgery_protection.rb b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
index 2ba0d6e5cd..8c25b147ef 100644
--- a/actionpack/lib/action_controller/metal/request_forgery_protection.rb
+++ b/actionpack/lib/action_controller/metal/request_forgery_protection.rb
@@ -47,6 +47,7 @@ module ActionController #:nodoc:
     extend ActiveSupport::Concern
 
     include AbstractController::Helpers
+    include AbstractController::Callbacks
 
     included do
       # Sets the token parameter name for RequestForgery. Calling +protect_from_forgery+