aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-01-11 17:49:56 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-01-11 17:49:56 +0900
commit492576e77bbaf8040758ad58854f535d528cc96e (patch)
tree33e1bb49a87e779fec881f036e8ec1f2b452b8f4
parentc82fa1851427eaaf6baba9828da229fdfa8c5482 (diff)
downloadrails-492576e77bbaf8040758ad58854f535d528cc96e.tar.gz
rails-492576e77bbaf8040758ad58854f535d528cc96e.tar.bz2
rails-492576e77bbaf8040758ad58854f535d528cc96e.zip
Current default Rails app encoding "utf-8" looks more like a W3C charset than a ruby encoding
-rw-r--r--actionpack/lib/action_dispatch/http/response.rb2
-rw-r--r--railties/lib/rails/application/configuration.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index 516a2af69a..dc159596c4 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -425,7 +425,7 @@ module ActionDispatch # :nodoc:
def set_content_type(content_type, charset)
type = (content_type || "").dup
- type << "; charset=#{charset}" if charset
+ type << "; charset=#{charset.to_s.downcase}" if charset
set_header CONTENT_TYPE, type
end
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb
index 0226c0ffe5..a9cc244869 100644
--- a/railties/lib/rails/application/configuration.rb
+++ b/railties/lib/rails/application/configuration.rb
@@ -22,7 +22,7 @@ module Rails
def initialize(*)
super
- self.encoding = "utf-8"
+ self.encoding = Encoding::UTF_8
@allow_concurrency = nil
@consider_all_requests_local = false
@filter_parameters = []