Skip to content

[pull] master from ruby:master #439

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 2 commits into from
Nov 6, 2025
Merged

[pull] master from ruby:master #439

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8c95c9d
Dispatch by platform at load
nobu Nov 5, 2025
89056f4
[DOC] Stop documentation for internals
nobu Nov 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions ext/socket/lib/socket.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,7 @@ def accept_nonblock(exception: true)
__accept_nonblock(exception)
end

# :stopdoc:
RESOLUTION_DELAY = 0.05
private_constant :RESOLUTION_DELAY

Expand All @@ -616,6 +617,7 @@ def accept_nonblock(exception: true)

IPV6_ADDRESS_FORMAT = /\A(?i:(?:(?:[0-9A-F]{1,4}:){7}(?:[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){6}(?:[0-9A-F]{1,4}|:(?:[0-9A-F]{1,4}:){1,5}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){5}(?:(?::[0-9A-F]{1,4}){1,2}|:(?:[0-9A-F]{1,4}:){1,4}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){4}(?:(?::[0-9A-F]{1,4}){1,3}|:(?:[0-9A-F]{1,4}:){1,3}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){3}(?:(?::[0-9A-F]{1,4}){1,4}|:(?:[0-9A-F]{1,4}:){1,2}[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){2}(?:(?::[0-9A-F]{1,4}){1,5}|:(?:[0-9A-F]{1,4}:)[0-9A-F]{1,4}|:)|(?:[0-9A-F]{1,4}:){1}(?:(?::[0-9A-F]{1,4}){1,6}|:(?:[0-9A-F]{1,4}:){0,5}[0-9A-F]{1,4}|:)|(?:::(?:[0-9A-F]{1,4}:){0,7}[0-9A-F]{1,4}|::)))(?:%.+)?\z/
private_constant :IPV6_ADDRESS_FORMAT
# :startdoc:

# :call-seq:
# Socket.tcp(host, port, local_host=nil, local_port=nil, [opts]) {|socket| ... }
Expand Down Expand Up @@ -680,6 +682,7 @@ def self.tcp(host, port, local_host = nil, local_port = nil, connect_timeout: ni
end
end

# :stopdoc:
def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil, connect_timeout: nil, resolv_timeout: nil, open_timeout: nil)
if local_host || local_port
local_addrinfos = Addrinfo.getaddrinfo(local_host, local_port, nil, :STREAM, timeout: resolv_timeout)
Expand Down Expand Up @@ -923,6 +926,7 @@ def self.tcp_with_fast_fallback(host, port, local_host = nil, local_port = nil,
connecting_socket.close
end
end
private_class_method :tcp_with_fast_fallback

def self.tcp_without_fast_fallback(host, port, local_host, local_port, connect_timeout:, resolv_timeout:, open_timeout:)
last_error = nil
Expand Down Expand Up @@ -1106,7 +1110,6 @@ def any_unresolved_family?
end
private_constant :HostnameResolutionStore

# :stopdoc:
def self.ip_sockets_port0(ai_list, reuseaddr)
sockets = []
begin
Expand Down Expand Up @@ -1139,9 +1142,7 @@ def self.ip_sockets_port0(ai_list, reuseaddr)
end
sockets
end
class << self
private :ip_sockets_port0
end
private_class_method :ip_sockets_port0

def self.tcp_server_sockets_port0(host)
ai_list = Addrinfo.getaddrinfo(host, 0, nil, :STREAM, nil, Socket::AI_PASSIVE)
Expand Down Expand Up @@ -1569,13 +1570,18 @@ def self.unix_server_socket(path)
end
end

class << self
private

def unix_socket_abstract_name?(path)
/linux/ =~ RUBY_PLATFORM && /\A(\0|\z)/ =~ path
# :stopdoc:
if RUBY_PLATFORM.include?("linux")
def self.unix_socket_abstract_name?(path)
path.empty? or path.start_with?("\0")
end
else
def self.unix_socket_abstract_name?(path)
false
end
end
private_class_method :unix_socket_abstract_name?
# :startdoc:

# creates a UNIX socket server on _path_.
# It calls the block for each socket accepted.
Expand Down