Merge commit 'rails/3-0-unstable'

Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb

1 files changed, 21 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..3bf3dbebab
--- /dev/null
+++ b/actionpack/lib/action_controller/dispatch/middlewares.rb
@@ -0,0 +1,21 @@
+use "Rack::Lock", :if => lambda {
+  !ActionController::Base.allow_concurrency
+}
+
+use "ActionDispatch::Failsafe"
+
+["ActionDispatch::Session::CookieStore",
+ "ActionDispatch::Session::MemCacheStore",
+ "ActiveRecord::SessionStore"].each do |store|
+   use(store, ActionController::Base.session_options,
+      :if => lambda {
+        if session_store = ActionController::Base.session_store
+          session_store.name == store
+        end
+      }
+    )
+end
+
+use "ActionDispatch::RewindableInput"
+use "ActionDispatch::ParamsParser"
+use "Rack::MethodOverride"