aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails
diff options
context:
space:
mode:
authorPrem Sichanugrist <s@sikachu.com>2011-02-23 03:02:39 +0700
committerAaron Patterson <aaron.patterson@gmail.com>2011-02-25 10:03:53 -0800
commit515ea955b6a80ab9f527ad0f6dcc25a17688a02c (patch)
tree4d610b79a6a304d3732366ad12ae5560e2952ff1 /railties/lib/rails
parent439a74520daa6ff255c83000cf6b0f3407805acf (diff)
downloadrails-515ea955b6a80ab9f527ad0f6dcc25a17688a02c.tar.gz
rails-515ea955b6a80ab9f527ad0f6dcc25a17688a02c.tar.bz2
rails-515ea955b6a80ab9f527ad0f6dcc25a17688a02c.zip
Always use ActionDispatch::ShowExceptions middleware [#6462 state:resolved]
This will make sure the application will raise `ActionController::RoutingError` in case "X-Cascade: pass" header was set, usually when there's no route match.
Diffstat (limited to 'railties/lib/rails')
-rw-r--r--railties/lib/rails/application.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index fb0f6fe032..94819820bc 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -157,7 +157,7 @@ module Rails
middleware.use ::Rack::Lock unless config.allow_concurrency
middleware.use ::Rack::Runtime
middleware.use ::Rails::Rack::Logger
- middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local if config.action_dispatch.show_exceptions
+ middleware.use ::ActionDispatch::ShowExceptions, config.consider_all_requests_local
middleware.use ::ActionDispatch::RemoteIp, config.action_dispatch.ip_spoofing_check, config.action_dispatch.trusted_proxies
middleware.use ::Rack::Sendfile, config.action_dispatch.x_sendfile_header
middleware.use ::ActionDispatch::Reloader unless config.cache_classes