diff options
author | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-06 14:11:23 -0800 |
---|---|---|
committer | Rafael Mendonça França <rafaelmfranca@gmail.com> | 2013-01-06 14:11:23 -0800 |
commit | 699bae691f3b692be3d93d75fde955fc4d23dd09 (patch) | |
tree | ae658fd339a7e283775aee2f71dd9b894b05fbe4 | |
parent | 9ee65aaaadfe40b0cd816e6665419cf55888f38e (diff) | |
parent | 8f18550b0acbcdc918bbfbf8c8f2f7521cbac0d5 (diff) | |
download | rails-699bae691f3b692be3d93d75fde955fc4d23dd09.tar.gz rails-699bae691f3b692be3d93d75fde955fc4d23dd09.tar.bz2 rails-699bae691f3b692be3d93d75fde955fc4d23dd09.zip |
Merge pull request #8782 from tank-bohr/master
doesn't work with rubinius
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/debug_exceptions.rb | 4 |
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 6bc5876b6c..3f1cf14825 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 - response = (_, headers, body = @app.call(env)) + status, headers, body = @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) : response + exception ? render_exception(env, exception) : [status, headers, body] end private |