From 39ee412b14cbd60e108a2de62715c254f41f6bb2 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 30 May 2019 09:14:41 +0000
Subject: 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_5@67709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 test/test_tempfile.rb | 22 ++++++++++++++++++++--
 version.h             |  6 +++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/test/test_tempfile.rb b/test/test_tempfile.rb
index 6b7860fe20..fb1027ba78 100644
--- a/test/test_tempfile.rb
+++ b/test/test_tempfile.rb
@@ -379,8 +379,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
@@ -388,8 +394,14 @@ 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!
+    t&.close!
   end
 
   def test_create_traversal_dir
@@ -397,5 +409,11 @@ puts Tempfile.new('foo').path
     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
   end
 end
diff --git a/version.h b/version.h
index f6fa5d41cd..df6930e4fb 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
 #define RUBY_VERSION "2.5.6"
-#define RUBY_RELEASE_DATE "2019-05-03"
-#define RUBY_PATCHLEVEL 166
+#define RUBY_RELEASE_DATE "2019-05-30"
+#define RUBY_PATCHLEVEL 167
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 3
+#define RUBY_RELEASE_DAY 30
 
 #include "ruby/version.h"
 
-- 
cgit v1.2.3