diff options
| -rw-r--r-- | NEWS | 5 | ||||
| -rw-r--r-- | lib/open-uri.rb | 9 | ||||
| -rw-r--r-- | test/open-uri/test_open-uri.rb | 2 |
3 files changed, 9 insertions, 7 deletions
@@ -212,7 +212,10 @@ Net::IMAP:: open-uri:: * Warn open-uri's "open" method at Kernel. - Use URI.open instead. + Use URI.open instead. [Misc #15893] + + * The default charset of text/* media type is UTF-8 instead of ISO-8859-1. + [Bug #15933] Pathname: diff --git a/lib/open-uri.rb b/lib/open-uri.rb index 3aeed06ed4..d9517e4b9e 100644 --- a/lib/open-uri.rb +++ b/lib/open-uri.rb @@ -552,17 +552,16 @@ module OpenURI # It can be used to guess charset. # # If charset parameter and block is not given, - # nil is returned except text type in HTTP. - # In that case, "iso-8859-1" is returned as defined by RFC2616 3.7.1. + # nil is returned except text type. + # In that case, "utf-8" is returned as defined by RFC6838 4.2.1 def charset type, *parameters = content_type_parse if pair = parameters.assoc('charset') pair.last.downcase elsif block_given? yield - elsif type && %r{\Atext/} =~ type && - @base_uri && /\Ahttp\z/i =~ @base_uri.scheme - "iso-8859-1" # RFC2616 3.7.1 + elsif type && %r{\Atext/} =~ type + "utf-8" # RFC6838 4.2.1 else nil end diff --git a/test/open-uri/test_open-uri.rb b/test/open-uri/test_open-uri.rb index 39cf4201a2..0c7d77c305 100644 --- a/test/open-uri/test_open-uri.rb +++ b/test/open-uri/test_open-uri.rb @@ -648,7 +648,7 @@ class TestOpenURI < Test::Unit::TestCase URI.open("#{url}/nc/") {|f| assert_equal("aa", f.read) assert_equal("text/plain", f.content_type) - assert_equal("iso-8859-1", f.charset) + assert_equal("utf-8", f.charset) assert_equal("unknown", f.charset { "unknown" }) } } |