diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-20 01:40:30 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-05-20 01:40:30 +0000 |
commit | 88bcccd4333fee37e90dc524ccb7cc20745e0332 (patch) | |
tree | 364306a4580ce96511ce69f3e49ee4e259948f94 /test/webrick | |
parent | bcddf03238140babb6112d289fd88e118390d4ce (diff) | |
download | ruby-88bcccd4333fee37e90dc524ccb7cc20745e0332.tar.gz |
webrick: fix non-ascii escape bugs
* 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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@40848 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/webrick')
-rw-r--r-- | test/webrick/test_htmlutils.rb | 6 | ||||
-rw-r--r-- | test/webrick/test_httputils.rb | 4 |
2 files changed, 9 insertions, 1 deletions
diff --git a/test/webrick/test_htmlutils.rb b/test/webrick/test_htmlutils.rb index 987bc229c9..1fe49ee226 100644 --- a/test/webrick/test_htmlutils.rb +++ b/test/webrick/test_htmlutils.rb @@ -11,6 +11,10 @@ class TestWEBrickHTMLUtils < Test::Unit::TestCase assert_equal("foo"bar", escape("foo\"bar")) assert_equal("foo>bar", escape("foo>bar")) assert_equal("foo<bar", escape("foo<bar")) - assert_equal("こんにちは", escape("こんにちは")) + 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 diff --git a/test/webrick/test_httputils.rb b/test/webrick/test_httputils.rb index ebe8a2b8a5..2753cbe6c9 100644 --- a/test/webrick/test_httputils.rb +++ b/test/webrick/test_httputils.rb @@ -66,6 +66,10 @@ class TestWEBrickHTTPUtils < Test::Unit::TestCase 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 |