aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/dispatcher.rb
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2008-12-15 16:33:31 -0600
committerJoshua Peek <josh@joshpeek.com>2008-12-15 16:33:31 -0600
commited708307137c811d14e5fd2cb4ea550add381a82 (patch)
tree31cb7df0a489bb4bbb0a9bc9edb24a70a869a0d1 /actionpack/lib/action_controller/dispatcher.rb
parente8c1915416579a3840573ca2c80822d96cb31823 (diff)
downloadrails-ed708307137c811d14e5fd2cb4ea550add381a82.tar.gz
rails-ed708307137c811d14e5fd2cb4ea550add381a82.tar.bz2
rails-ed708307137c811d14e5fd2cb4ea550add381a82.zip
Switch to Rack based session stores.
Diffstat (limited to 'actionpack/lib/action_controller/dispatcher.rb')
-rw-r--r--actionpack/lib/action_controller/dispatcher.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/actionpack/lib/action_controller/dispatcher.rb b/actionpack/lib/action_controller/dispatcher.rb
index 203f6b1683..c9a9264b6d 100644
--- a/actionpack/lib/action_controller/dispatcher.rb
+++ b/actionpack/lib/action_controller/dispatcher.rb
@@ -45,8 +45,10 @@ module ActionController
end
cattr_accessor :middleware
- self.middleware = MiddlewareStack.new
- self.middleware.use "ActionController::Failsafe"
+ self.middleware = MiddlewareStack.new do |middleware|
+ middleware.use "ActionController::Failsafe"
+ middleware.use "ActionController::SessionManagement::Middleware"
+ end
include ActiveSupport::Callbacks
define_callbacks :prepare_dispatch, :before_dispatch, :after_dispatch
@@ -89,7 +91,7 @@ module ActionController
def _call(env)
@request = RackRequest.new(env)
- @response = RackResponse.new(@request)
+ @response = RackResponse.new
dispatch
end