summaryrefslogtreecommitdiff
path: root/lib/rexml
diff options
context:
space:
mode:
authorkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-23 08:23:10 +0000
committerkou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-23 08:23:10 +0000
commit93647e81a6d46c2e3f52618521a5b78b61e686d5 (patch)
tree05c9bd15b7603570f1e1e4af6e80928de96d4a5e /lib/rexml
parentf6c56982abcff846d18a179c7e56182959f48025 (diff)
* 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
Diffstat (limited to 'lib/rexml')
-rw-r--r--lib/rexml/source.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb
index a0bbe25..cfafdbd 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, ""