Skip to content
Browse files

Fix syntax error in dispatcher than wrecked failsafe responses. Closes

…#8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7002 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent b94f8e1 commit e4e275dde3b6ff1bcdc5f12631faa48585cb491f @jeremy jeremy committed Jun 11, 2007
Showing with 3 additions and 2 deletions.
  1. +2 −0 railties/CHANGELOG
  2. +1 −2 railties/lib/dispatcher.rb
View
2 railties/CHANGELOG
@@ -1,5 +1,7 @@
*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]
* Sexy migrations for the session_migration generator. #8561 [Vladislav]
View
3 railties/lib/dispatcher.rb
@@ -40,8 +40,7 @@ def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_
end
rescue Exception => exception # errors from CGI dispatch
failsafe_response(cgi, output, '500 Internal Server Error', exception) do
- controller ||= ApplicationController rescue LoadError nil
- controller ||= ActionController::Base
+ controller ||= ApplicationController rescue ActionController::Base
controller.process_with_exception(request, response, exception).out(output)
end
ensure

0 comments on commit e4e275d

Please sign in to comment.
Something went wrong with that request. Please try again.