From 93647e81a6d46c2e3f52618521a5b78b61e686d5 Mon Sep 17 00:00:00 2001 From: kou Date: Thu, 23 Oct 2014 08:23:10 +0000 Subject: * lib/rexml/source.rb (REXML::IOSource#encoding_updated): Fix a bug that can't parse XML correctly when Encoding.default_internal is different with XML encoding. REXML::Source converts XML encoding on read. So IO should not convert XML encoding. Based on patch by NAKAMURA Usaku. [ruby-dev:48686] [Bug #10418] * test/rexml/test_encoding.rb (REXMLTests::EncodingTester#test_parse_utf16_with_utf8_default_internal): Add the for the above case. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48109 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rexml/source.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb index a0bbe25de7..cfafdbd67a 100644 --- a/lib/rexml/source.rb +++ b/lib/rexml/source.rb @@ -285,7 +285,7 @@ module REXML case @encoding when "UTF-16BE", "UTF-16LE" @source.binmode - @source.set_encoding(@encoding) + @source.set_encoding(@encoding, @encoding) end @line_break = encode(">") @pending_buffer, @buffer = @buffer, "" -- cgit v1.2.3