aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorDan Kang <dan@dskang.com>2014-02-08 17:40:08 -0800
committerDan Kang <dan@dskang.com>2014-02-08 23:22:04 -0800
commit069bc273853c90194606b1725113d77ae39e2edd (patch)
treeed9e6c7b1f52adc19db3a657f9ed69a21a82b720 /actionpack/lib
parentcbd10e27d1fa6e07d39dbb6fb42ce3420c5959db (diff)
downloadrails-069bc273853c90194606b1725113d77ae39e2edd.tar.gz
rails-069bc273853c90194606b1725113d77ae39e2edd.tar.bz2
rails-069bc273853c90194606b1725113d77ae39e2edd.zip
Prevent [response].flatten from recursing infinitely.
Returning `self` from within the array returned by `to_ary` caused this. Instead, we can just substitute another object. It provides the `each` behavior required by the rack spec.
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_dispatch/http/response.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index bc13ee00f1..2c6bcf7b7b 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -313,7 +313,7 @@ module ActionDispatch # :nodoc:
header.delete CONTENT_TYPE
[status, header, []]
else
- [status, header, self]
+ [status, header, Rack::BodyProxy.new(self){}]
end
end
end