summaryrefslogtreecommitdiff
path: root/ChangeLog
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-19 09:38:35 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-08-19 09:38:35 +0000
commitcc15ebe00eee5110d0c2fcd722c3373c65baae4a (patch)
tree741481105661c84e2a2e44340cb07b8844b8672a /ChangeLog
parent66ecb1a9a4c96b82bd90767097cc3898340997b8 (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_1_9_3@42623 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e987caed7..0c844f937c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Aug 19 18:36:37 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]
+
Mon Aug 19 18:34:31 2013 Charlie Somerville <charliesome@ruby-lang.org>
* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.