naruse	2012-08-22 07:30:47 +0900 (Wed, 22 Aug 2012)

  New Revision: 36766

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

  Log:
    * lib/cgi/util.rb (CGI.escapeHTML): use '
      [ruby-core:47221] [Bug #6861]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36765)
+++ ChangeLog	(revision 36766)
@@ -1,3 +1,8 @@
+Wed Aug 22 07:27:00 2012  NARUSE, Yui  <naruse@r...>
+
+	* lib/cgi/util.rb (CGI.escapeHTML): use &#39;
+	  [ruby-core:47221] [Bug #6861]
+
 Tue Aug 21 21:59:22 2012  Ayumu AIZAWA  <ayumu.aizawa@g...>
 
 	* lib/observer.rb: fix typo. https://github.com/ruby/ruby/pull/162 by
Index: lib/cgi/util.rb
===================================================================
--- lib/cgi/util.rb	(revision 36765)
+++ lib/cgi/util.rb	(revision 36766)
@@ -22,7 +22,7 @@
 
   # The set of special characters and their escaped values
   TABLE_FOR_ESCAPE_HTML__ = {
-    "'" => '&#x27;',
+    "'" => '&#39;',
     '&' => '&amp;',
     '"' => '&quot;',
     '<' => '&lt;',
Index: test/erb/test_erb.rb
===================================================================
--- test/erb/test_erb.rb	(revision 36765)
+++ test/erb/test_erb.rb	(revision 36766)
@@ -39,8 +39,7 @@
   end
 
   def test_html_escape
-    # TODO: &apos; should be changed to &#x27;
-    assert_equal(" !&quot;\#$%&amp;&#x27;()*+,-./0123456789:;&lt;=&gt;?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~",
+    assert_equal(" !&quot;\#$%&amp;&#39;()*+,-./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 36765)
+++ test/cgi/test_cgi_util.rb	(revision 36766)
@@ -54,11 +54,11 @@
   end
 
   def test_cgi_escapeHTML
-    assert_equal(CGI::escapeHTML("'&\"><"),"&#x27;&amp;&quot;&gt;&lt;")
+    assert_equal(CGI::escapeHTML("'&\"><"),"&#39;&amp;&quot;&gt;&lt;")
   end
 
   def test_cgi_unescapeHTML
-    assert_equal(CGI::unescapeHTML("&apos;&amp;&quot;&gt;&lt;"),"'&\"><")
+    assert_equal(CGI::unescapeHTML("&#39;&amp;&quot;&gt;&lt;"),"'&\"><")
   end
 
 end

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