diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 15:39:43 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-16 15:39:43 +0000 |
commit | 98905e2201ba9382334da3c61ed3469ac30e00d0 (patch) | |
tree | 762d360d64c26570e79ab0482644da93dacda1a9 | |
parent | d15c1d10f63cee7ceb028a3762a4b8cc697427ef (diff) |
merge revision(s) 42421,42422: [Backport #8746]
* test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}):
mswin is not only mswin32 but also mswin64.
mswin is not only mswin32 but also mswin64. [Bug #8746]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42589 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | test/webrick/test_cgi.rb | 4 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 3 deletions
@@ -1,3 +1,8 @@ +Sat Aug 17 00:39:20 2013 NAKAMURA Usaku <usa@ruby-lang.org> + + * test/webrick/test_cgi.rb (TestWEBrickCGI#{start_cgi_server,test_cgi}): + mswin is not only mswin32 but also mswin64. [Bug #8746] + Sat Aug 17 00:36:24 2013 Charlie Somerville <charliesome@ruby-lang.org> * test/openssl/test_ssl.rb: Fix test for CVE-2013-4073. diff --git a/test/webrick/test_cgi.rb b/test/webrick/test_cgi.rb index d2d54171f8..72de8a0ca6 100644 --- a/test/webrick/test_cgi.rb +++ b/test/webrick/test_cgi.rb @@ -20,7 +20,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| @@ -40,7 +40,7 @@ class TestWEBrickCGI < Test::Unit::TestCase req = Net::HTTP::Get.new("/webrick.cgi/%A4%DB%A4%B2/%A4%DB%A4%B2") # Path info of res.body is passed via ENV. # ENV[] returns different value on Windows depending on locale. - unless RUBY_PLATFORM =~ /mswin32|mingw|cygwin|bccwin32/ && + unless RUBY_PLATFORM =~ /mswin|mingw|cygwin|bccwin32/ && Encoding.find("locale") != Encoding.find("filesystem") http.request(req){|res| assert_equal("/\xA4\xDB\xA4\xB2/\xA4\xDB\xA4\xB2", res.body, log.call)} @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.0.0" #define RUBY_RELEASE_DATE "2013-08-17" -#define RUBY_PATCHLEVEL 293 +#define RUBY_PATCHLEVEL 294 #define RUBY_RELEASE_YEAR 2013 #define RUBY_RELEASE_MONTH 8 |