summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--test/webrick/test_cgi.rb4
2 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b9e85fb829..f0f82e9a0d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Aug 7 16:34:30 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.
+
Wed Aug 7 16:19:12 2013 Koichi Sasada <ko1@atdot.net>
* cont.c (rb_fiber_start): use RARRAY_RAWPTR() instead of
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)}