Changeset 7007

Timestamp:

06/12/07 16:47:18 (1 year ago)

Author:

bitsweat

Message:

Merge [7006] to stable: fix precedence error in failsafe rescue. References #8625.

Files:

• branches/1-2-stable/railties/lib/dispatcher.rb (modified) (1 diff)

branches/1-2-stable/railties/lib/dispatcher.rb

@@ -43 +43 @@
-    rescue Exception => exception  # errors from CGI dispatch
-      failsafe_response(output, '500 Internal Server Error', exception) do
-ApplicationController rescue ActionController::Base
+(ApplicationController rescue ActionController::Base)
-        controller.process_with_exception(request, response, exception).out(output)
-      end