diff options
| author | Grey Baker <greysteil@gmail.com> | 2016-07-12 16:41:09 +0100 |
|---|---|---|
| committer | Grey Baker <greysteil@gmail.com> | 2016-07-12 16:41:09 +0100 |
| commit | fe859a54219740fa8b4e09a592820d2ee12ba222 (patch) | |
| tree | e02383486dfc0eb60178f30bbcb414611cc0a08a /actionpack/lib/action_dispatch | |
| parent | de1227a5472f688469379054d271b59be1ecfcd0 (diff) | |
| download | rails-fe859a54219740fa8b4e09a592820d2ee12ba222.tar.gz rails-fe859a54219740fa8b4e09a592820d2ee12ba222.tar.bz2 rails-fe859a54219740fa8b4e09a592820d2ee12ba222.zip | |
Handle `Rack::QueryParser` errors in `ActionDispatch::ExceptionWrapper`
Rack [recently](https://github.com/rack/rack/commit/7e7a3890449b5cf5b86929c79373506e5f1909fb)
moved the namespace of its `ParameterTypeError` and `InvalidParameterError`
errors. Whilst an alias for the old name was added, the logic in
`ActionDispatch::ExceptionWrapper` was still broken by this change, since it
relies on the class name.
This PR updates `ActionDispatch::ExceptionWrapper` to handle the Rack 2.0
namespaced errors correctly. We no longer need to worry about the old names,
since Rails specifies Rack ~> 2.0.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb index 59edc66086..b02f10c9ec 100644 --- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb +++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb @@ -17,8 +17,8 @@ module ActionDispatch 'ActionDispatch::ParamsParser::ParseError' => :bad_request, 'ActionController::BadRequest' => :bad_request, 'ActionController::ParameterMissing' => :bad_request, - 'Rack::Utils::ParameterTypeError' => :bad_request, - 'Rack::Utils::InvalidParameterError' => :bad_request + 'Rack::QueryParser::ParameterTypeError' => :bad_request, + 'Rack::QueryParser::InvalidParameterError' => :bad_request ) cattr_accessor :rescue_templates |