Merged updates from trunk into stable branch

[feedcatcher.git] / vendor / rails / actionpack / lib / action_controller / middlewares.rb

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