merge revision(s) dcb6a6ae3e2b8a3e298e7f0d4a3e7f8ff102a30e: [Backport #15845]

	Windows simply causes an error to open invalid path


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_6@67715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 21 insertions, 3 deletions

diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb
index 27263fca80..203059e41c 100644
--- a/test/test_tempfile.rb
+++ b/test/test_tempfile.rb
@@ -381,8 +381,14 @@ puts Tempfile.new('foo').path
     t = Tempfile.open([TRAVERSAL_PATH, 'foo'])
     actual = Dir.glob(TRAVERSAL_PATH + '*').count
     assert_equal expect, actual
+  rescue Errno::EINVAL
+    if /mswin|mingw/ =~ RUBY_PLATFORM
+      assert "ok"
+    else
+      raise $!
+    end
   ensure
-    t.close!
+    t&.close!
   end
 
   def test_new_traversal_dir
@@ -390,6 +396,12 @@ puts Tempfile.new('foo').path
     t = Tempfile.new(TRAVERSAL_PATH + 'foo')
     actual = Dir.glob(TRAVERSAL_PATH + '*').count
     assert_equal expect, actual
+  rescue Errno::EINVAL
+    if /mswin|mingw/ =~ RUBY_PLATFORM
+      assert "ok"
+    else
+      raise $!
+    end
   ensure
     t&.close!
   end
@@ -399,6 +411,12 @@ puts Tempfile.new('foo').path
     t = Tempfile.create(TRAVERSAL_PATH + 'foo')
     actual = Dir.glob(TRAVERSAL_PATH + '*').count
     assert_equal expect, actual
+  rescue Errno::EINVAL
+    if /mswin|mingw/ =~ RUBY_PLATFORM
+      assert "ok"
+    else
+      raise $!
+    end
   ensure
     if t
       t.close
diff --git a/version.h b/version.h
index e70843b75c..a49de1842d 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.6.3"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 67
+#define RUBY_PATCHLEVEL 68
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 7
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 28
 
 #include "ruby/version.h"