From 2e766b159f597f4da55a4cd57c20a9d8c34dd3e7 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Mon, 9 Oct 2006 00:21:47 +0000
Subject: Fixed that some 500 rescues would cause 500's themselves because the
 response had not yet been generated #6329 [cmselmer]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5241 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG                                                    | 2 ++
 .../lib/action_controller/templates/rescues/_request_and_response.rhtml | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 703bb23948..48596f3618 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that some 500 rescues would cause 500's themselves because the response had not yet been generated #6329 [cmselmer]
+
 * respond_to :html doesn't assume .rhtml.  #6281 [Hampton Catlin]
 
 * Fixed some deprecation warnings in ActionPack [Rick Olson]
diff --git a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
index d949ffc837..f2f5732ecd 100644
--- a/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
+++ b/actionpack/lib/action_controller/templates/rescues/_request_and_response.rhtml
@@ -41,4 +41,4 @@
 
 
 <h2 style="margin-top: 30px">Response</h2>
-<b>Headers</b>: <%=h response.headers.inspect.gsub(/,/, ",\n") %><br/>
+<b>Headers</b>: <%=h response ? response.headers.inspect.gsub(/,/, ",\n") : "None" %><br/>
-- 
cgit v1.2.3