aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-09-23 14:39:45 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-09-23 15:48:01 -0700
commite16afe61abd78c55f80752ca020b90d59ae1940f (patch)
tree9d7d55fa0da6bce1234367b634ae1a48aec88112 /actionpack/lib/action_controller/metal
parent28cb10b15e8950ff21a26c8849e55d5ca3c25d6b (diff)
downloadrails-e16afe61abd78c55f80752ca020b90d59ae1940f.tar.gz
rails-e16afe61abd78c55f80752ca020b90d59ae1940f.tar.bz2
rails-e16afe61abd78c55f80752ca020b90d59ae1940f.zip
stop applying default headers in ActionDispatch::Response
I'm making this change so that I can construct response objects that *don't* have the default headers applied. For example, I would like to construct a response object from the return value of a controller. If you need to construct a response object with the default headers, then please use the alternate constructor: `ActionDispatch::Response.create`
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/live.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index 667c7f87ca..c874165816 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -236,6 +236,10 @@ module ActionController
end
end
+ def initialize(status = 200, header = {}, body = [])
+ super(status, Header.new(self, header), body)
+ end
+
private
def before_committed
@@ -257,10 +261,6 @@ module ActionController
buf
end
- def merge_default_headers(original, default)
- Header.new self, super
- end
-
def handle_conditional_get!
super unless committed?
end