usa	2014-02-14 13:24:27 +0900 (Fri, 14 Feb 2014)

  New Revision: 44934

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

  Log:
    merge revision(s) 40848: [Backport #8425]
    
    * lib/webrick/htmlutils.rb (WEBrick::HTMLUtils#escape): replace HTML
      meta chars even in non-ascii string.  [Bug #8425] [ruby-core:55052]
    
    * lib/webrick/httputils.rb (WEBrick::HTTPUtils#{_escape,_unescape}):
      fix %-escape encodings.  [Bug #8425] [ruby-core:55052]

  Modified directories:
    branches/ruby_1_9_3/
  Modified files:
    branches/ruby_1_9_3/lib/webrick/htmlutils.rb
    branches/ruby_1_9_3/lib/webrick/httputils.rb
    branches/ruby_1_9_3/test/webrick/test_httputils.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/lib/webrick/htmlutils.rb
===================================================================
--- ruby_1_9_3/lib/webrick/htmlutils.rb	(revision 44933)
+++ ruby_1_9_3/lib/webrick/htmlutils.rb	(revision 44934)
@@ -15,12 +15,13 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/webrick/htmlutils.rb#L15
     # Escapes &, ", > and < in +string+
 
     def escape(string)
-      str = string ? string.dup : ""
+      return "" unless string
+      str = string.dup.force_encoding('binary')
       str.gsub!(/&/n, '&amp;')
       str.gsub!(/\"/n, '&quot;')
       str.gsub!(/>/n, '&gt;')
       str.gsub!(/</n, '&lt;')
-      str
+      str.force_encoding(string.encoding)
     end
     module_function :escape
 
Index: ruby_1_9_3/lib/webrick/httputils.rb
===================================================================
--- ruby_1_9_3/lib/webrick/httputils.rb	(revision 44933)
+++ ruby_1_9_3/lib/webrick/httputils.rb	(revision 44934)
@@ -350,8 +350,18 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/lib/webrick/httputils.rb#L350
 
     def _make_regex(str) /([#{Regexp.escape(str)}])/n end
     def _make_regex!(str) /([^#{Regexp.escape(str)}])/n end
-    def _escape(str, regex) str.gsub(regex){ "%%%02X" % $1.ord } end
-    def _unescape(str, regex) str.gsub(regex){ $1.hex.chr } end
+    def _escape(str, regex)
+      str = str.dup.force_encoding('binary')
+      str.gsub!(regex) {"%%%02X" % $1.ord}
+      # %-escaped string should contain US-ASCII only
+      str.force_encoding(Encoding::US_ASCII)
+    end
+    def _unescape(str, regex)
+      str = str.dup.force_encoding('binary')
+      str.gsub!(regex) {$1.hex.chr}
+      # encoding of %-unescaped string is unknown
+      str
+    end
 
     UNESCAPED = _make_regex(control+space+delims+unwise+nonascii)
     UNESCAPED_FORM = _make_regex(reserved+control+delims+unwise+nonascii)
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 44933)
+++ ruby_1_9_3/version.h	(revision 44934)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 517
+#define RUBY_PATCHLEVEL 518
 
 #define RUBY_RELEASE_DATE "2014-02-14"
 #define RUBY_RELEASE_YEAR 2014
Index: ruby_1_9_3/test/webrick/test_httputils.rb
===================================================================
--- ruby_1_9_3/test/webrick/test_httputils.rb	(revision 44933)
+++ ruby_1_9_3/test/webrick/test_httputils.rb	(revision 44934)
@@ -66,6 +66,10 @@ class TestWEBrickHTTPUtils < Test::Unit: https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/webrick/test_httputils.rb#L66
     assert_equal("/~foo%20bar", escape("/~foo bar"))
     assert_equal("/~foo%09bar", escape("/~foo\tbar"))
     assert_equal("/~foo+bar", escape("/~foo+bar"))
+    bug8425 = '[Bug #8425] [ruby-core:55052]'
+    assert_nothing_raised(ArgumentError, Encoding::CompatibilityError, bug8425) {
+      assert_equal("%E3%83%AB%E3%83%93%E3%83%BC%E3%81%95%E3%82%93", escape("\u{30EB 30D3 30FC 3055 3093}"))
+    }
   end
 
   def test_escape_form

Property changes on: ruby_1_9_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r40848


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