aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2011-12-07 21:11:08 +0900
committerkennyj <kennyj@gmail.com>2011-12-07 21:11:08 +0900
commit199353c658007727a428949ac11663175fb2c531 (patch)
treeecce749177a9814040ca9c429dcd540b9ad1b8d0 /actionpack/lib
parenta1986e7d55bed6895cab3d8b490f769d7abe727b (diff)
downloadrails-199353c658007727a428949ac11663175fb2c531.tar.gz
rails-199353c658007727a428949ac11663175fb2c531.tar.bz2
rails-199353c658007727a428949ac11663175fb2c531.zip
Assign config.encoding to AD::Response.default_charset at the initialization time.
Diffstat (limited to 'actionpack/lib')
-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 2ba3198ebd..a4f4825f92 100644
--- a/actionpack/lib/action_dispatch/railtie.rb
+++ b/actionpack/lib/action_dispatch/railtie.rb
@@ -21,6 +21,7 @@ module ActionDispatch
initializer "action_dispatch.configure" do |app|
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.encoding
ActionDispatch::ExceptionWrapper.rescue_responses.merge!(config.action_dispatch.rescue_responses)
ActionDispatch::ExceptionWrapper.rescue_templates.merge!(config.action_dispatch.rescue_templates)