aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
diff options
context:
space:
mode:
authorkennyj <kennyj@gmail.com>2011-12-07 01:46:41 +0900
committerkennyj <kennyj@gmail.com>2011-12-07 12:35:44 +0900
commita1986e7d55bed6895cab3d8b490f769d7abe727b (patch)
tree063f4ea3916c3c3a24b7ca053042af725a345857 /actionpack/lib/action_dispatch
parent9be2353fac89729b839df3d0538b607f3fc1aa87 (diff)
downloadrails-a1986e7d55bed6895cab3d8b490f769d7abe727b.tar.gz
rails-a1986e7d55bed6895cab3d8b490f769d7abe727b.tar.bz2
rails-a1986e7d55bed6895cab3d8b490f769d7abe727b.zip
Use default charset when we read content type without charset.
Diffstat (limited to 'actionpack/lib/action_dispatch')
-rw-r--r--actionpack/lib/action_dispatch/http/response.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/http/response.rb b/actionpack/lib/action_dispatch/http/response.rb
index f1e85559a3..a1ece87d21 100644
--- a/actionpack/lib/action_dispatch/http/response.rb
+++ b/actionpack/lib/action_dispatch/http/response.rb
@@ -69,7 +69,7 @@ module ActionDispatch # :nodoc:
if content_type = self["Content-Type"]
type, charset = content_type.split(/;\s*charset=/)
@content_type = Mime::Type.lookup(type)
- @charset = charset || "UTF-8"
+ @charset = charset || self.class.default_charset
end
prepare_cache_control!