diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 18:22:35 -0800 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-12-15 18:22:35 -0800 |
| commit | 89056885b030b981193d73ebde56cf60829a924c (patch) | |
| tree | 9d432f7226754115ac4d2ef8aa1134221ff294bb /actionpack/lib/action_controller/dispatcher.rb | |
| parent | 19be3d35b38b6685789d8d343617d465a3652717 (diff) | |
| parent | 43ac42c46a462e1453b1b97da00e11bff7bba55d (diff) | |
| download | rails-89056885b030b981193d73ebde56cf60829a924c.tar.gz rails-89056885b030b981193d73ebde56cf60829a924c.tar.bz2 rails-89056885b030b981193d73ebde56cf60829a924c.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller/dispatcher.rb')
| -rw-r--r-- | actionpack/lib/action_controller/dispatcher.rb | 8 |
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 |