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

3 files changed, 7 insertions, 2 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.
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/version.h b/version.h
index b79742675b..e55538c157 100644
--- a/version.h
+++ b/version.h
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 468
+#define RUBY_PATCHLEVEL 469
 
 #define RUBY_RELEASE_DATE "2013-08-19"
 #define RUBY_RELEASE_YEAR 2013