mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rexml: 1.9 patch from Sam Ruby mentioned in his blog:
<http://intertwingly.net/blog/2007/12/31/Porting-REXML-to-Ruby-1-9> [ruby-core:14639] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14826 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
96e7713754
commit
1448668244
16 changed files with 91 additions and 67 deletions
|
@ -56,14 +56,14 @@ module REXML
|
|||
|
||||
def check_encoding str
|
||||
# We have to recognize UTF-16, LSB UTF-16, and UTF-8
|
||||
if str[0] == 0xfe && str[1] == 0xff
|
||||
if str[0,2] == "\xfe\xff"
|
||||
str[0,2] = ""
|
||||
return UTF_16
|
||||
elsif str[0] == 0xff && str[1] == 0xfe
|
||||
elsif str[0,2] == "\xff\xfe"
|
||||
str[0,2] = ""
|
||||
return UNILE
|
||||
end
|
||||
str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/um
|
||||
str =~ /^\s*<\?xml\s+version\s*=\s*(['"]).*?\1\s+encoding\s*=\s*(["'])(.*?)\2/m
|
||||
return $3.upcase if $3
|
||||
return UTF_8
|
||||
end
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue