kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fix syntax error in dispatcher than wrecked failsafe responses. Closes #8625.

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7002 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jeremy Kemper 2007-06-11 18:05:02 +00:00
parent b94f8e1d29
commit e4e275dde3
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
railties/CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN* *SVN*
* Fix syntax error in dispatcher than wrecked failsafe responses. #8625 [mtitorenko]
* Scaffolded validation errors set the appropriate HTTP status for XML responses. #6946, #8622 [Manfred Stienstra, mmmultiworks] * Scaffolded validation errors set the appropriate HTTP status for XML responses. #6946, #8622 [Manfred Stienstra, mmmultiworks]
* Sexy migrations for the session_migration generator. #8561 [Vladislav] * Sexy migrations for the session_migration generator. #8561 [Vladislav]

3
railties/lib/dispatcher.rb
View file

@ -40,8 +40,7 @@ class Dispatcher
end end
rescue Exception => exception # errors from CGI dispatch rescue Exception => exception # errors from CGI dispatch
failsafe_response(cgi, output, '500 Internal Server Error', exception) do failsafe_response(cgi, output, '500 Internal Server Error', exception) do
controller ||= ApplicationController rescue LoadError nil controller ||= ApplicationController rescue ActionController::Base
controller ||= ActionController::Base
controller.process_with_exception(request, response, exception).out(output) controller.process_with_exception(request, response, exception).out(output)
end end
ensure ensure