From a1986e7d55bed6895cab3d8b490f769d7abe727b Mon Sep 17 00:00:00 2001
From: kennyj <kennyj@gmail.com>
Date: Wed, 7 Dec 2011 01:46:41 +0900
Subject: Use default charset when we read content type without charset.
---
actionpack/lib/action_dispatch/http/response.rb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'actionpack/lib')
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!
--
cgit v1.2.3