usa	2013-08-19 18:38:35 +0900 (Mon, 19 Aug 2013)

  New Revision: 42623

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

  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_1_9_3/
  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/test/webrick/test_cgi.rb
    branches/ruby_1_9_3/version.h
Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 42622)
+++ ruby_1_9_3/ChangeLog	(revision 42623)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/ChangeLog#L1
+Mon Aug 19 18:36:37 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]
+
 Mon Aug 19 18:34:31 2013  Charlie Somerville  <charliesome@r...>
 
 	* test/openssl/test_ssl.rb: Fix test for CVE-2013-4073.
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 42622)
+++ ruby_1_9_3/version.h	(revision 42623)
@@ -1,5 +1,5 @@ https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/version.h#L1
 #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
Index: ruby_1_9_3/test/webrick/test_cgi.rb
===================================================================
--- ruby_1_9_3/test/webrick/test_cgi.rb	(revision 42622)
+++ ruby_1_9_3/test/webrick/test_cgi.rb	(revision 42623)
@@ -19,7 +19,7 @@ class TestWEBrickCGI < Test::Unit::TestC https://github.com/ruby/ruby/blob/trunk/ruby_1_9_3/test/webrick/test_cgi.rb#L19
         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|

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


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