diff options
author | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-28 11:20:45 +0000 |
---|---|---|
committer | kou <kou@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-10-28 11:20:45 +0000 |
commit | f774c96beb1fd61720b335b1b7b54cf9422a6f2d (patch) | |
tree | 03ae0127158691692699e6a9094947960ed010e3 | |
parent | 054ae037e656b349fa55f32aa18c1338027ed26e (diff) | |
download | ruby-f774c96beb1fd61720b335b1b7b54cf9422a6f2d.tar.gz |
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
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | lib/rexml/source.rb | 4 |
2 files changed, 2 insertions, 8 deletions
@@ -1,9 +1,3 @@ -Sun Oct 28 19:54:43 2012 Kouhei Sutou <kou@cozmixng.org> - - * 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 <tadf@dotrb.org> * 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") |