Merge commit 'mainstream/master'

Conflicts:
	actionpack/lib/action_controller/base.rb
	railties/guides/source/caching_with_rails.textile

1 files changed, 13 insertions, 0 deletions

diff --git a/actionpack/lib/action_controller/dispatch/middlewares.rb b/actionpack/lib/action_controller/dispatch/middlewares.rb
new file mode 100644
index 0000000000..b62b4f84a1
--- /dev/null
+++ b/actionpack/lib/action_controller/dispatch/middlewares.rb
@@ -0,0 +1,13 @@
+use "Rack::Lock", :if => lambda {
+  !ActionController::Base.allow_concurrency
+}
+
+use "ActionDispatch::Failsafe"
+
+use lambda { ActionController::Base.session_store },
+    lambda { ActionController::Base.session_options }
+
+use "ActionDispatch::RewindableInput"
+use "ActionDispatch::ParamsParser"
+use "Rack::MethodOverride"
+use "Rack::Head"