diff options
| author | Andrew White <pixeltrix@users.noreply.github.com> | 2017-03-30 10:29:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-30 10:29:33 +0100 |
| commit | 93982de132f5e3fdcd7794d697a6566bd98da393 (patch) | |
| tree | 29931ab5884d351069ca1970934814b61a2801c2 /actionpack/lib | |
| parent | f6eeb4e6e578a5fd3113f24ce55831edaf8e1116 (diff) | |
| parent | 9d695743dee0eb57cedd1f0e7a9dc1a16ef0b530 (diff) | |
| download | rails-93982de132f5e3fdcd7794d697a6566bd98da393.tar.gz rails-93982de132f5e3fdcd7794d697a6566bd98da393.tar.bz2 rails-93982de132f5e3fdcd7794d697a6566bd98da393.zip | |
Merge pull request #28606 from maclover7/jm-fix-25820
Do not include default response headers for AC::Metal
Diffstat (limited to 'actionpack/lib')
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 6 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/metal.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 0fe0853da3..b420e00c78 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -261,6 +261,12 @@ module ActionController PROTECTED_IVARS end + def self.make_response!(request) + ActionDispatch::Response.create.tap do |res| + res.request = request + end + end + ActiveSupport.run_load_hooks(:action_controller, self) end end diff --git a/actionpack/lib/action_controller/metal.rb b/actionpack/lib/action_controller/metal.rb index 74c4153cd2..246644dcbd 100644 --- a/actionpack/lib/action_controller/metal.rb +++ b/actionpack/lib/action_controller/metal.rb @@ -129,7 +129,7 @@ module ActionController end def self.make_response!(request) - ActionDispatch::Response.create.tap do |res| + ActionDispatch::Response.new.tap do |res| res.request = request end end |