diff options
| author | Rick Olson <technoweenie@gmail.com> | 2007-09-23 02:32:55 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2007-09-23 02:32:55 +0000 |
| commit | 4e3ed5bc44f6cd20c9e353ab63fd24b92a7942be (patch) | |
| tree | 1904187d3254fdc42681471e67608615993a355d /actionpack/lib/action_controller/rescue.rb | |
| parent | 3dea8b580b9c67bb27c01290fb3b17f446544b78 (diff) | |
| download | rails-4e3ed5bc44f6cd20c9e353ab63fd24b92a7942be.tar.gz rails-4e3ed5bc44f6cd20c9e353ab63fd24b92a7942be.tar.bz2 rails-4e3ed5bc44f6cd20c9e353ab63fd24b92a7942be.zip | |
Merge csrf_killer plugin into rails. Adds RequestForgeryProtection model that verifies session-specific _tokens for non-GET requests. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7592 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/rescue.rb')
| -rw-r--r-- | actionpack/lib/action_controller/rescue.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/rescue.rb b/actionpack/lib/action_controller/rescue.rb index 8cffc90d33..c1d2152acb 100644 --- a/actionpack/lib/action_controller/rescue.rb +++ b/actionpack/lib/action_controller/rescue.rb @@ -20,7 +20,8 @@ module ActionController #:nodoc: 'ActiveRecord::RecordInvalid' => :unprocessable_entity, 'ActiveRecord::RecordNotSaved' => :unprocessable_entity, 'ActionController::MethodNotAllowed' => :method_not_allowed, - 'ActionController::NotImplemented' => :not_implemented + 'ActionController::NotImplemented' => :not_implemented, + 'ActionController::InvalidToken' => :unprocessable_entity } DEFAULT_RESCUE_TEMPLATE = 'diagnostics' |