From dfa73d09be3a37b508ab4ae7df9bebdfee4ec9a8 Mon Sep 17 00:00:00 2001
From: J Smith <dark.panda@gmail.com>
Date: Mon, 7 Mar 2011 17:57:09 -0500
Subject: [PATCH] Make session and environment dumping configurable options.

---
 .../templates/rescues/_request_and_response.erb    |   12 ++++++++----
 actionpack/lib/action_dispatch/railtie.rb          |    2 ++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
index e963b04..d10a8db 100644
--- a/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
+++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/_request_and_response.erb
@@ -20,11 +20,15 @@
 <h2 style="margin-top: 30px">Request</h2>
 <p><b>Parameters</b>: <pre><%=h request_dump %></pre></p>
 
-<p><a href="#" onclick="document.getElementById('session_dump').style.display='block'; return false;">Show session dump</a></p>
-<div id="session_dump" style="display:none"><pre><%= debug_hash @request.session %></pre></div>
+<% if Rails.application.config.action_dispatch.dump_session_on_error %>
+  <p><a href="#" onclick="document.getElementById('session_dump').style.display='block'; return false;">Show session dump</a></p>
+  <div id="session_dump" style="display:none"><pre><%= debug_hash @request.session %></pre></div>
+<% end %>
 
-<p><a href="#" onclick="document.getElementById('env_dump').style.display='block'; return false;">Show env dump</a></p>
-<div id="env_dump" style="display:none"><pre><%= debug_hash @request.env %></pre></div>
+<% if Rails.application.config.action_dispatch.dump_environment_on_error %>
+  <p><a href="#" onclick="document.getElementById('env_dump').style.display='block'; return false;">Show env dump</a></p>
+  <div id="env_dump" style="display:none"><pre><%= debug_hash @request.env %></pre></div>
+<% end %>
 
 
 <h2 style="margin-top: 30px">Response</h2>
diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb
index ed066ad..85a6e31 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -8,5 +8,7 @@ module ActionDispatch
     config.action_dispatch.ip_spoofing_check = true
     config.action_dispatch.show_exceptions = true
     config.action_dispatch.best_standards_support = true
+    config.action_dispatch.dump_session_on_error = true
+    config.action_dispatch.dump_environment_on_error = false
   end
 end
-- 
1.7.4.1