kazu	2008-02-17 23:08:27 +0900 (Sun, 17 Feb 2008)

  New Revision: 15526

  Modified files:
    trunk/ChangeLog
    trunk/lib/cgi.rb

  Log:
    * lib/cgi.rb (CGI::escapeHTML): use gsub with Hash. [ruby-dev:33828]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/cgi.rb?r1=15526&r2=15525&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15526&r2=15525&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15525)
+++ ChangeLog	(revision 15526)
@@ -1,3 +1,7 @@
+Sun Feb 17 23:06:55 2008  Kazuhiro NISHIYAMA  <zn@m...>
+
+	* lib/cgi.rb (CGI::escapeHTML): use gsub with Hash. [ruby-dev:33828]
+
 Sun Feb 17 21:38:21 2008  NARUSE, Yui  <naruse@r...>
 
 	* encoding.c (ENC_CODERANGE_AND): fix broken case. [ruby-dev:33826]
Index: lib/cgi.rb
===================================================================
--- lib/cgi.rb	(revision 15525)
+++ lib/cgi.rb	(revision 15526)
@@ -355,12 +355,18 @@
     end
   end
 
+  TABLE_FOR_ESCAPE_HTML__ = {
+    '&' => '&amp;',
+    '"' => '&quot;',
+    '<' => '&lt;',
+    '>' => '&gt;',
+  }
 
   # Escape special characters in HTML, namely &\"<>
   #   CGI::escapeHTML('Usage: foo "bar" <baz>')
   #      # => "Usage: foo &quot;bar&quot; &lt;baz&gt;"
   def CGI::escapeHTML(string)
-    string.gsub(/&/, '&amp;').gsub(/\"/, '&quot;').gsub(/>/, '&gt;').gsub(/</, '&lt;')
+    string.gsub(/[&\"<>]/, TABLE_FOR_ESCAPE_HTML__)
   end
 
 

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