diff options
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index 5014ad80aa..11b7534ea4 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -97,9 +97,7 @@ module ActionDispatch # :nodoc: def initialize(status = 200, header = {}, body = []) super() - if self.class.default_headers.respond_to?(:merge) - header = self.class.default_headers.merge(header) - end + header = merge_default_headers(header, self.class.default_headers) self.body, self.header, self.status = body, header, status @@ -243,6 +241,12 @@ module ActionDispatch # :nodoc: private + def merge_default_headers(original, default) + return original unless default.respond_to?(:merge) + + default.merge(original) + end + def build_buffer(response, body) Buffer.new response, body end |