diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 15:50:19 -0800 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2009-12-21 15:50:19 -0800 |
| commit | fee07b9da0bddbb1833da947ed73e7a165d040e7 (patch) | |
| tree | 2ca31c6143bb4741cf738da1e5be31cb446afc22 /actionpack/lib/action_controller | |
| parent | cf66d16bdfcb46c217ea06c05b8e0c5dfff73889 (diff) | |
| parent | 880688a499b4066d6654a4cd11b76d14cc62865e (diff) | |
| download | rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.tar.gz rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.tar.bz2 rails-fee07b9da0bddbb1833da947ed73e7a165d040e7.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_controller')
| -rw-r--r-- | actionpack/lib/action_controller/metal/rack_delegation.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/rack_delegation.rb b/actionpack/lib/action_controller/metal/rack_delegation.rb index 5141918499..833475cff7 100644 --- a/actionpack/lib/action_controller/metal/rack_delegation.rb +++ b/actionpack/lib/action_controller/metal/rack_delegation.rb @@ -3,7 +3,7 @@ module ActionController extend ActiveSupport::Concern included do - delegate :session, :reset_session, :to => "@_request" + delegate :session, :to => "@_request" delegate :headers, :status=, :location=, :content_type=, :status, :location, :content_type, :to => "@_response" attr_internal :request @@ -24,5 +24,9 @@ module ActionController response.body = body if response super end + + def reset_session + @_request.reset_session + end end end |