aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2015-09-24 10:33:25 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2015-09-24 13:54:42 -0700
commitfcf5e178dd6384cb5f9e99c0026ba958e426a03f (patch)
treece090f8d2af0da0b0a05a068ad2cca57072cbb68 /actionpack/lib/action_controller
parenta2448e74b9de544dd8b3fef7f0da0a91140af492 (diff)
downloadrails-fcf5e178dd6384cb5f9e99c0026ba958e426a03f.tar.gz
rails-fcf5e178dd6384cb5f9e99c0026ba958e426a03f.tar.bz2
rails-fcf5e178dd6384cb5f9e99c0026ba958e426a03f.zip
move the Header hash to the super class
I want to move the header hash to the super request object in order to consolidate behavior. We should be switching out buffering strategies rather than header strategies since things like "mutating headers after send" is an error in both cases (buffering vs streaming).
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/live.rb27
1 files changed, 0 insertions, 27 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index c874165816..5de5b02b32 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -213,33 +213,6 @@ module ActionController
end
class Response < ActionDispatch::Response #:nodoc: all
- class Header < DelegateClass(Hash) # :nodoc:
- def initialize(response, header)
- @response = response
- super(header)
- end
-
- def []=(k,v)
- if @response.committed?
- raise ActionDispatch::IllegalStateError, 'header already sent'
- end
-
- super
- end
-
- def merge(other)
- self.class.new @response, __getobj__.merge(other)
- end
-
- def to_hash
- __getobj__.dup
- end
- end
-
- def initialize(status = 200, header = {}, body = [])
- super(status, Header.new(self, header), body)
- end
-
private
def before_committed