aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-06 16:00:14 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-01-06 16:00:14 -0800
commitdc4b4c46ef531255276ac6a66cfee5ee03126a9c (patch)
treee5f59833a57567f7d985c7f7f64ef22db06b55e0 /actionpack/lib/action_dispatch
parentfb7c093d931e808164e7ab7b66f26d6227264549 (diff)
parentf3101fd0fcfc2b67478ca5c968d5d5394d13ff5f (diff)
downloadrails-dc4b4c46ef531255276ac6a66cfee5ee03126a9c.tar.gz
rails-dc4b4c46ef531255276ac6a66cfee5ee03126a9c.tar.bz2
rails-dc4b4c46ef531255276ac6a66cfee5ee03126a9c.zip
Merge pull request #8787 from tank-bohr/master
masgn and response variable
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/middleware/debug_exceptions.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
index 1a2758380b..e710bfe9fd 100644
--- a/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
+++ b/actionpack/lib/action_dispatch/middleware/debug_exceptions.rb
@@ -15,7 +15,7 @@ module ActionDispatch
def call(env)
begin
- status, headers, body = @app.call(env)
+ _, headers, body = response = @app.call(env)
if headers['X-Cascade'] == 'pass'
body.close if body.respond_to?(:close)
@@ -25,7 +25,7 @@ module ActionDispatch
raise exception if env['action_dispatch.show_exceptions'] == false
end
- exception ? render_exception(env, exception) : [status, headers, body]
+ exception ? render_exception(env, exception) : response
end
private