xibbar	2012-08-14 12:03:42 +0900 (Tue, 14 Aug 2012)

  New Revision: 36692

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=36692

  Log:
    * lib/cgi/util.rb (CGI::escapeHTML): ' is not recommended. [Bug #6850]

  Modified files:
    trunk/lib/cgi/util.rb
    trunk/test/cgi/test_cgi_util.rb
    trunk/test/erb/test_erb.rb

Index: lib/cgi/util.rb
===================================================================
--- lib/cgi/util.rb	(revision 36691)
+++ lib/cgi/util.rb	(revision 36692)
@@ -22,7 +22,7 @@
 
   # The set of special characters and their escaped values
   TABLE_FOR_ESCAPE_HTML__ = {
-    "'" => ''',
+    "'" => ''',
     '&' => '&',
     '"' => '"',
     '<' => '&lt;',
Index: test/erb/test_erb.rb
===================================================================
--- test/erb/test_erb.rb	(revision 36691)
+++ test/erb/test_erb.rb	(revision 36692)
@@ -40,7 +40,7 @@
 
   def test_html_escape
     # TODO: &apos; should be changed to &#x27;
-    assert_equal(" !&quot;\#$%&amp;&apos;()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+    assert_equal(" !&quot;\#$%&amp;&#x27;()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
                  ERB::Util.html_escape(" !\"\#$%&'()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~"))
 
     assert_equal("", ERB::Util.html_escape(""))
Index: test/cgi/test_cgi_util.rb
===================================================================
--- test/cgi/test_cgi_util.rb	(revision 36691)
+++ test/cgi/test_cgi_util.rb	(revision 36692)
@@ -54,7 +54,7 @@
   end
 
   def test_cgi_escapeHTML
-    assert_equal(CGI::escapeHTML("'&\"><"),"&apos;&amp;&quot;&gt;&lt;")
+    assert_equal(CGI::escapeHTML("'&\"><"),"&#x27;&amp;&quot;&gt;&lt;")
   end
 
   def test_cgi_unescapeHTML

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/