Move Dispatcher.dispatch CGI.new out of default args and into rescuable block so the dispatcher catches its errors rather than the fcgi handler.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2839 5ecf4fe2-1ee6-0310-87b1-e25e094e27de

2 files changed, 14 insertions, 12 deletions

diff --git a/railties/CHANGELOG b/railties/CHANGELOG
index c6914af35c..48ff33608e 100644
--- a/railties/CHANGELOG
+++ b/railties/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Move Dispatcher.dispatch CGI.new out of default args and into rescuable block so the dispatcher catches its errors rather than the fcgi handler.  [Jeremy Kemper]
+
 * The freeze_gems Rake task accepts the VERSION environment variable to decide which version of Rails to pull into vendor/rails.  [Chad Fowler, Jeremy Kemper]
 
 * Removed script.aculo.us.js, builder.js and slider.js (preperation for move of scriptaculous extensions to plugins, core scriptaculous will remain in Railties) [Thomas Fuchs]
diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb
index a3382b3fc6..73bedf5ecf 100644
--- a/railties/lib/dispatcher.rb
+++ b/railties/lib/dispatcher.rb
@@ -26,19 +26,19 @@
 # the environment (when Dependencies.load? is true) after each request.
 class Dispatcher
   class << self
-    
+
     # Dispatch the given CGI request, using the given session options, and
-    # emitting the output via the given output.
-    def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, output = $stdout)
-      begin
-        request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi)
-        prepare_application
-        ActionController::Routing::Routes.recognize!(request).process(request, response).out(output)
-      rescue Object => exception
-        ActionController::Base.process_with_exception(request, response, exception).out(output)
-      ensure
-        reset_after_dispatch
-      end
+    # emitting the output via the given output.  If you dispatch with your
+    # own CGI object, be sure to handle the exceptions it raises.
+    def dispatch(cgi = nil, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS, output = $stdout)
+      cgi ||= CGI.new
+      request, response = ActionController::CgiRequest.new(cgi, session_options), ActionController::CgiResponse.new(cgi)
+      prepare_application
+      ActionController::Routing::Routes.recognize!(request).process(request, response).out(output)
+    rescue Object => exception
+      ActionController::Base.process_with_exception(request, response, exception).out(output)
+    ensure
+      reset_after_dispatch
     end
 
     # Reset the application by clearing out loaded controllers, views, actions,