From f774c96beb1fd61720b335b1b7b54cf9422a6f2d Mon Sep 17 00:00:00 2001 From: kou Date: Sun, 28 Oct 2012 11:20:45 +0000 Subject: [PATCH] Revert r37358 * lib/rexml/source.rb (REXML::IOSource#initialize): Use encode("UTF-16XX") instead of UTF-16XX encoded byte string by hand. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37359 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ------ lib/rexml/source.rb | 4 ++-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index baef4bebaa..595c359615 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,3 @@ -Sun Oct 28 19:54:43 2012 Kouhei Sutou - - * lib/rexml/source.rb (REXML::IOSource#initialize): Use - encode("UTF-16XX") instead of UTF-16XX encoded byte string by - hand. - Sun Oct 28 19:12:11 2012 Tadayoshi Funaba * ext/date/date_parse.c (iso8601_{ext,bas}_time): should not match diff --git a/lib/rexml/source.rb b/lib/rexml/source.rb index 46c2fc79cd..112393cfd4 100644 --- a/lib/rexml/source.rb +++ b/lib/rexml/source.rb @@ -149,9 +149,9 @@ module REXML if encoding self.encoding = encoding elsif str[0,2] == "\xfe\xff" - @line_break = ">".encode("UTF-16BE") + @line_break = "\000>" elsif str[0,2] == "\xff\xfe" - @line_break = ">".encode("UTF-16LE") + @line_break = ">\000" elsif str[0,2] == "\xef\xbb" str += @source.read(1) str = '' if (str[2,1] == "\xBF")