diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-17 14:00:10 -0800 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2016-02-17 14:01:19 -0800 |
| commit | 844fb632d4b6744172cfcc87d4143efbf451d679 (patch) | |
| tree | e8c9521cbe253bc66b3368aa37ff1254db89acdc /actionpack | |
| parent | f1866e81a392f61552bc03b4f9a54b97d65e98f0 (diff) | |
| download | rails-844fb632d4b6744172cfcc87d4143efbf451d679.tar.gz rails-844fb632d4b6744172cfcc87d4143efbf451d679.tar.bz2 rails-844fb632d4b6744172cfcc87d4143efbf451d679.zip | |
partially revert 69009f4473637a44ade26d954ef5ddea6ff903f2
we need to continue setting the body on the request object because of
Fiber based streaming templates. Fixes #23659
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 1641d01c30..f6e67b02d7 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -175,10 +175,7 @@ module ActionController body = [body] unless body.nil? || body.respond_to?(:each) response.reset_body! return unless body - body.each { |part| - next if part.empty? - response.write part - } + response.body = body super end |