[前][次][番号順一覧][スレッド一覧]

ruby-changes:74358

From: nagachika <ko1@a...>
Date: Sat, 5 Nov 2022 14:24:54 +0900 (JST)
Subject: [ruby-changes:74358] 01eab9a5d1 (ruby_3_1): merge revision(s) 16953867ed8fc951364f05fdf0c9267799e3087a: [Backport #18380]

https://git.ruby-lang.org/ruby.git/commit/?id=01eab9a5d1

From 01eab9a5d1886412869f85d4b87779f22d548867 Mon Sep 17 00:00:00 2001
From: nagachika <nagachika@r...>
Date: Sat, 5 Nov 2022 14:20:23 +0900
Subject: merge revision(s) 16953867ed8fc951364f05fdf0c9267799e3087a: [Backport
 #18380]

	We don't care about actual hostname resolution. (#6652)

	https://bugs.ruby-lang.org/issues/18380
	---
	 test/fiber/test_address_resolve.rb | 2 +-
	 1 file changed, 1 insertion(+), 1 deletion(-)
---
 test/fiber/test_address_resolve.rb | 2 +-
 version.h                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/fiber/test_address_resolve.rb b/test/fiber/test_address_resolve.rb
index 457221b9b1..12223bcc06 100644
--- a/test/fiber/test_address_resolve.rb
+++ b/test/fiber/test_address_resolve.rb
@@ -269,7 +269,7 @@ class TestAddressResolve < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/test/fiber/test_address_resolve.rb#L269
       Fiber.set_scheduler scheduler
 
       Fiber.schedule do
-        result = Socket.getnameinfo(["AF_INET", 80, "example.com"], Socket::NI_NUMERICSERV)
+        result = Socket.getnameinfo(["AF_INET", 80, "example.com"], Socket::NI_NUMERICSERV | Socket::NI_NUMERICHOST)
 
         assert_equal(["1.2.3.4", "80"], result)
       end
diff --git a/version.h b/version.h
index 594763cf6e..e70b3360d5 100644
--- a/version.h
+++ b/version.h
@@ -11,7 +11,7 @@ https://github.com/ruby/ruby/blob/trunk/version.h#L11
 # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR
 #define RUBY_VERSION_TEENY 3
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 174
+#define RUBY_PATCHLEVEL 175
 
 #define RUBY_RELEASE_YEAR 2022
 #define RUBY_RELEASE_MONTH 11
-- 
cgit v1.2.3


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

[前][次][番号順一覧][スレッド一覧]