nagachika	2013-08-17 00:39:43 +0900 (Sat, 17 Aug 2013)

  New Revision: 42589

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=42589

  Log:
    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]

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/test/webrick/test_cgi.rb
    branches/ruby_2_0_0/version.h
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 42588)
+++ ruby_2_0_0/ChangeLog	(revision 42589)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Sat Aug 17 00:39:20 2013  NAKAMURA Usaku  <usa@r...>
+
+	* 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@r...>
 
 	* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 42588)
+++ ruby_2_0_0/version.h	(revision 42589)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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
Index: ruby_2_0_0/test/webrick/test_cgi.rb
===================================================================
--- ruby_2_0_0/test/webrick/test_cgi.rb	(revision 42588)
+++ ruby_2_0_0/test/webrick/test_cgi.rb	(revision 42589)
@@ -20,7 +20,7 @@ class TestWEBrickCGI < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/webrick/test_cgi.rb#L20
         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::TestC https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/test/webrick/test_cgi.rb#L40
       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)}

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r42421-42422


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/