diff options
| author | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-20 09:01:04 +0000 |
|---|---|---|
| committer | Paul Sherwood <paul.sherwood@codethink.co.uk> | 2014-04-20 09:01:04 +0000 |
| commit | 6ecf40e1fa1b2c55f63d0ccb46bce2fca73b40ad (patch) | |
| tree | 368a0326bcf36bc7e06cbbe7a1d55b752afd86ba /test/webrick | |
| parent | cb3ea602294b5038b5f7ac21d3875a2b52342956 (diff) | |
| parent | 680d09b61ea7d850e27944311723a40c596e5d95 (diff) | |
| download | ruby-6ecf40e1fa1b2c55f63d0ccb46bce2fca73b40ad.tar.gz | |
Merge commit '680d09' into baserock/ps/proto-web-systembaserock/ps/proto-web-system
Diffstat (limited to 'test/webrick')
| -rw-r--r-- | test/webrick/test_cgi.rb | 2 | ||||
| -rw-r--r-- | test/webrick/test_httputils.rb | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb index d930c265de..702b8b46bd 100644 --- a/test/webrick/test_cgi.rb +++ b/test/webrick/test_cgi.rb @@ -19,7 +19,7 @@ class TestWEBrickCGI < Test::Unit::TestCase end }, } - if RUBY_PLATFORM =~ /mswin32|mingw|cygwin|bccwin32/ + if RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/ config[:CGIPathEnv] = ENV['PATH'] # runtime dll may not be in system dir. end TestWEBrick.start_httpserver(config){|server, addr, port, log| 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 |