ruby-changes:32933
From: nagachika <ko1@a...>
Date: Mon, 17 Feb 2014 01:56:08 +0900 (JST)
Subject: [ruby-changes:32933] nagachika:r45012 (ruby_2_0_0): merge revision(s) r40830, r40848: [Backport #8425]
nagachika 2014-02-17 01:56:01 +0900 (Mon, 17 Feb 2014) New Revision: 45012 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=45012 Log: merge revision(s) r40830,r40848: [Backport #8425] * test/webrick/test_htmlutils.rb: add test for WEBrick::HTMLUtils. * 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] Added files: branches/ruby_2_0_0/test/webrick/test_htmlutils.rb Modified directories: branches/ruby_2_0_0/ Modified files: branches/ruby_2_0_0/ChangeLog branches/ruby_2_0_0/lib/webrick/htmlutils.rb branches/ruby_2_0_0/lib/webrick/httputils.rb branches/ruby_2_0_0/test/webrick/test_httputils.rb branches/ruby_2_0_0/version.h Index: ruby_2_0_0/ChangeLog =================================================================== --- ruby_2_0_0/ChangeLog (revision 45011) +++ ruby_2_0_0/ChangeLog (revision 45012) @@ -1,3 +1,15 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1 +Mon Feb 17 01:51:49 2014 Nobuyoshi Nakada <nobu@r...> + + * 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] + +Mon Feb 17 01:51:49 2014 Ayumu AIZAWA <ayumu.aizawa@g...> + + * test/webrick/test_htmlutils.rb: add test for WEBrick::HTMLUtils. + Mon Feb 17 01:41:59 2014 Masaki Matsushita <glass.saga@g...> * array.c (rb_hash_rehash): use hash_alloc() instead of rb_hash_new(). Index: ruby_2_0_0/lib/webrick/htmlutils.rb =================================================================== --- ruby_2_0_0/lib/webrick/htmlutils.rb (revision 45011) +++ ruby_2_0_0/lib/webrick/htmlutils.rb (revision 45012) @@ -15,12 +15,13 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/webrick/htmlutils.rb#L15 # Escapes &, ", > and < in +string+ def escape(string) - str = string ? string.dup : "" + return "" unless string + str = string.b str.gsub!(/&/n, '&') str.gsub!(/\"/n, '"') str.gsub!(/>/n, '>') str.gsub!(/</n, '<') - str + str.force_encoding(string.encoding) end module_function :escape Index: ruby_2_0_0/lib/webrick/httputils.rb =================================================================== --- ruby_2_0_0/lib/webrick/httputils.rb (revision 45011) +++ ruby_2_0_0/lib/webrick/httputils.rb (revision 45012) @@ -437,8 +437,18 @@ module WEBrick https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/lib/webrick/httputils.rb#L437 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.b + 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.b + 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_2_0_0/version.h =================================================================== --- ruby_2_0_0/version.h (revision 45011) +++ ruby_2_0_0/version.h (revision 45012) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1 #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2014-02-17" -#define RUBY_PATCHLEVEL 430 +#define RUBY_PATCHLEVEL 431 #define RUBY_RELEASE_YEAR 2014 #define RUBY_RELEASE_MONTH 2 Index: ruby_2_0_0/test/webrick/test_htmlutils.rb =================================================================== --- ruby_2_0_0/test/webrick/test_htmlutils.rb (revision 0) +++ ruby_2_0_0/test/webrick/test_htmlutils.rb (revision 45012) @@ -0,0 +1,20 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/webrick/test_htmlutils.rb#L1 +require "test/unit" +require "webrick/htmlutils" + +class TestWEBrickHTMLUtils < Test::Unit::TestCase + include WEBrick::HTMLUtils + + def test_escape + assert_equal("foo", escape("foo")) + assert_equal("foo bar", escape("foo bar")) + assert_equal("foo&bar", escape("foo&bar")) + assert_equal("foo"bar", escape("foo\"bar")) + assert_equal("foo>bar", escape("foo>bar")) + assert_equal("foo<bar", escape("foo<bar")) + assert_equal("\u{3053 3093 306B 3061 306F}", escape("\u{3053 3093 306B 3061 306F}")) + bug8425 = '[Bug #8425] [ruby-core:55052]' + assert_nothing_raised(ArgumentError, Encoding::CompatibilityError, bug8425) { + assert_equal("\u{3053 3093 306B}\xff<", escape("\u{3053 3093 306B}\xff<")) + } + end +end Index: ruby_2_0_0/test/webrick/test_httputils.rb =================================================================== --- ruby_2_0_0/test/webrick/test_httputils.rb (revision 45011) +++ ruby_2_0_0/test/webrick/test_httputils.rb (revision 45012) @@ -66,6 +66,10 @@ class TestWEBrickHTTPUtils < Test::Unit: https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/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_2_0_0 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r40830,40848 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/