diff options
| author | Egor Homakov <homakov@gmail.com> | 2012-08-09 16:45:30 +0300 |
|---|---|---|
| committer | Egor Homakov <homakov@gmail.com> | 2012-08-09 16:45:30 +0300 |
| commit | 2a290f7f7cdf775491eda05b3690be6d96cd9bf6 (patch) | |
| tree | 929a9ad484ed85862a34f0840a1c68f0e184075a /actionpack/lib/action_dispatch | |
| parent | 2da242f63c28fbf476b814b18e184154a12d0f87 (diff) | |
| download | rails-2a290f7f7cdf775491eda05b3690be6d96cd9bf6.tar.gz rails-2a290f7f7cdf775491eda05b3690be6d96cd9bf6.tar.bz2 rails-2a290f7f7cdf775491eda05b3690be6d96cd9bf6.zip | |
introduce default_headers config
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/response.rb | 5 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/railtie.rb | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb index d336808e7c..5014ad80aa 100644 --- a/actionpack/lib/action_dispatch/http/response.rb +++ b/actionpack/lib/action_dispatch/http/response.rb @@ -58,6 +58,7 @@ module ActionDispatch # :nodoc: LOCATION = "Location".freeze cattr_accessor(:default_charset) { "utf-8" } + cattr_accessor(:default_headers) include Rack::Response::Helpers include ActionDispatch::Http::Cache::Response @@ -96,6 +97,10 @@ 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 + self.body, self.header, self.status = body, header, status @sending_file = false diff --git a/actionpack/lib/action_dispatch/railtie.rb b/actionpack/lib/action_dispatch/railtie.rb index 62f906219c..e7f3f07390 100644 --- a/actionpack/lib/action_dispatch/railtie.rb +++ b/actionpack/lib/action_dispatch/railtie.rb @@ -23,6 +23,7 @@ module ActionDispatch ActionDispatch::Http::URL.tld_length = app.config.action_dispatch.tld_length ActionDispatch::Request.ignore_accept_header = app.config.action_dispatch.ignore_accept_header ActionDispatch::Response.default_charset = app.config.action_dispatch.default_charset || app.config.encoding + ActionDispatch::Response.default_headers = app.config.action_dispatch.default_headers ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses) ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates) |