diff options
| author | xibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-04 04:42:35 +0000 |
|---|---|---|
| committer | xibbar <xibbar@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-07-04 04:42:35 +0000 |
| commit | 067b6e82376919a10f158237fe496fccbbc8150c (patch) | |
| tree | 42f799fb2fb33dfe32a3a239bbff5030aeae3d75 | |
| parent | 9c746e35ad3c265704710934e9dc44b1ff7f741a (diff) | |
Wed Jul 4 13:38:12 2012 Takeyuki FUJIOKA <xibbar@ruby-lang.org>
* lib/cgi/util.rb: revert 36299: ' is XML specification.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36305 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | lib/cgi/util.rb | 9 | ||||
| -rw-r--r-- | test/cgi/test_cgi_util.rb | 4 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lib/cgi/util.rb b/lib/cgi/util.rb index 9cfff99b78..b877c1bae7 100644 --- a/lib/cgi/util.rb +++ b/lib/cgi/util.rb @@ -22,7 +22,6 @@ class CGI # The set of special characters and their escaped values TABLE_FOR_ESCAPE_HTML__ = { - "'" => ''', '&' => '&', '"' => '"', '<' => '<', @@ -33,7 +32,7 @@ class CGI # CGI::escapeHTML('Usage: foo "bar" <baz>') # # => "Usage: foo "bar" <baz>" def CGI::escapeHTML(string) - string.gsub(/['&\"<>]/, TABLE_FOR_ESCAPE_HTML__) + string.gsub(/[&\"<>]/, TABLE_FOR_ESCAPE_HTML__) end # Unescape a string that has been HTML-escaped @@ -42,9 +41,8 @@ class CGI def CGI::unescapeHTML(string) enc = string.encoding if [Encoding::UTF_16BE, Encoding::UTF_16LE, Encoding::UTF_32BE, Encoding::UTF_32LE].include?(enc) - return string.gsub(Regexp.new('&(apos|amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do + return string.gsub(Regexp.new('&(amp|quot|gt|lt|#[0-9]+|#x[0-9A-Fa-f]+);'.encode(enc))) do case $1.encode("US-ASCII") - when 'apos' then "'".encode(enc) when 'amp' then '&'.encode(enc) when 'quot' then '"'.encode(enc) when 'gt' then '>'.encode(enc) @@ -55,10 +53,9 @@ class CGI end end asciicompat = Encoding.compatible?(string, "a") - string.gsub(/&(apos|amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/) do + string.gsub(/&(amp|quot|gt|lt|\#[0-9]+|\#x[0-9A-Fa-f]+);/) do match = $1.dup case match - when 'apos' then "'" when 'amp' then '&' when 'quot' then '"' when 'gt' then '>' diff --git a/test/cgi/test_cgi_util.rb b/test/cgi/test_cgi_util.rb index 5b43732476..a291d47f99 100644 --- a/test/cgi/test_cgi_util.rb +++ b/test/cgi/test_cgi_util.rb @@ -53,8 +53,4 @@ class CGIUtilTest < Test::Unit::TestCase assert_equal("<HTML>\n\t<BODY>\n\t</BODY>\n</HTML>\n",CGI::pretty("<HTML><BODY></BODY></HTML>","\t")) end - def test_cgi_unescapeHTML - assert_equal(CGI::unescapeHTML("'&"><"),"'&\"><") - end - end |