diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-09 08:50:28 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2014-02-09 08:50:28 -0800 |
| commit | 33be58b2060b1e859e8da370b911822c20028690 (patch) | |
| tree | 5cb9e699fb7721188c58853b93c7e27d11da58cb /actionpack/lib | |
| parent | a5ee843d9165fe6dbecb566f2315a8ca8c0c78ed (diff) | |
| parent | 069bc273853c90194606b1725113d77ae39e2edd (diff) | |
| download | rails-33be58b2060b1e859e8da370b911822c20028690.tar.gz rails-33be58b2060b1e859e8da370b911822c20028690.tar.bz2 rails-33be58b2060b1e859e8da370b911822c20028690.zip | |
Merge pull request #13982 from dskang/fix-response-flatten-infinite-recursion
Fix response flatten infinite recursion
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 2 |
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 |