diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 02:27:47 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-08-24 02:27:47 +0000 |
| commit | 55742dce2d30534faa95551c7904bbf660b4835b (patch) | |
| tree | 45425ee3f8e7586c45855db3dc086fcc99170bd7 | |
| parent | 82dc949bba9f6345ae75c0eafc8c4fdf5dbfb1d2 (diff) | |
| download | ruby-55742dce2d30534faa95551c7904bbf660b4835b.tar.gz | |
* lib/cgi.rb (CGI::unescapeHTML): consider ISO-8859-1.
[ruby-dev:35936]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@18802 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/cgi.rb | 18 |
2 files changed, 15 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Sun Aug 24 11:26:54 2008 NARUSE, Yui <naruse@ruby-lang.org> + + * lib/cgi.rb (CGI::unescapeHTML): consider ISO-8859-1. + [ruby-dev:35936] + Sun Aug 24 10:55:00 2008 NARUSE, Yui <naruse@ruby-lang.org> * enc/emacs_mule.c: support Emacs/Mule internal encoding. diff --git a/lib/cgi.rb b/lib/cgi.rb index ab57fbdcd0..52137d85ed 100644 --- a/lib/cgi.rb +++ b/lib/cgi.rb @@ -396,18 +396,20 @@ class CGI when 'gt' then '>' when 'lt' then '<' when /\A#0*(\d+)\z/ - if enc == Encoding::UTF_8 - $1.to_i.chr(enc) - elsif $1.to_i < 128 && asciicompat - $1.to_i.chr + n = $1.to_i + if enc == Encoding::UTF_8 or + enc == Encoding::ISO_8859_1 && n < 256 or + asciicompat && n < 128 + n.chr(enc) else "&##{$1};" end when /\A#x([0-9a-f]+)\z/i - if enc == Encoding::UTF_8 - $1.hex.chr(enc) - elsif $1.hex < 128 && asciicompat - $1.hex.chr + n = $1.hex + if enc == Encoding::UTF_8 or + enc == Encoding::ISO_8859_1 && n < 256 or + asciicompat && n < 128 + n.chr(enc) else "&#x#{$1};" end |