aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/railtie.rb
diff options
context:
space:
mode:
authorEgor Homakov <homakov@gmail.com>2012-08-09 16:45:30 +0300
committerEgor Homakov <homakov@gmail.com>2012-08-09 16:45:30 +0300
commit2a290f7f7cdf775491eda05b3690be6d96cd9bf6 (patch)
tree929a9ad484ed85862a34f0840a1c68f0e184075a /actionpack/lib/action_dispatch/railtie.rb
parent2da242f63c28fbf476b814b18e184154a12d0f87 (diff)
downloadrails-2a290f7f7cdf775491eda05b3690be6d96cd9bf6.tar.gz
rails-2a290f7f7cdf775491eda05b3690be6d96cd9bf6.tar.bz2
rails-2a290f7f7cdf775491eda05b3690be6d96cd9bf6.zip
introduce default_headers config
Diffstat (limited to 'actionpack/lib/action_dispatch/railtie.rb')
-rw-r--r--actionpack/lib/action_dispatch/railtie.rb1
1 files changed, 1 insertions, 0 deletions
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)