mirror of
https://github.com/iv-org/invidious
synced 2025-12-21 23:02:52 +01:00
Replace deprecated blocking property of Socket (#5538)
* Replace deprecated `blocking` property of `Socket` This replaces the deprecated argument `blocking` and uses `Socket.set_blocking(fd, value)` instead. Fixes a warning in the compiler https://github.com/crystal-lang/crystal/pull/16033 * Upgrade to upstream * chore: only Socket.set_blocking for > 1.18 --------- Co-authored-by: Emilien <4016501+unixfox@users.noreply.github.com>
This commit is contained in:
parent
1f5685ef92
commit
bf17d53068
@ -3,15 +3,28 @@
|
|||||||
# IPv6 addresses.
|
# IPv6 addresses.
|
||||||
#
|
#
|
||||||
class TCPSocket
|
class TCPSocket
|
||||||
def initialize(host, port, dns_timeout = nil, connect_timeout = nil, blocking = false, family = Socket::Family::UNSPEC)
|
{% if compare_versions(Crystal::VERSION, "1.18.0-dev") >= 0 %}
|
||||||
Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo|
|
def initialize(host : String, port, dns_timeout = nil, connect_timeout = nil, blocking = false, family = Socket::Family::UNSPEC)
|
||||||
super(addrinfo.family, addrinfo.type, addrinfo.protocol, blocking)
|
Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo|
|
||||||
connect(addrinfo, timeout: connect_timeout) do |error|
|
super(family: addrinfo.family, type: addrinfo.type, protocol: addrinfo.protocol)
|
||||||
close
|
Socket.set_blocking(self.fd, blocking)
|
||||||
error
|
connect(addrinfo, timeout: connect_timeout) do |error|
|
||||||
|
close
|
||||||
|
error
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
{% else %}
|
||||||
|
def initialize(host : String, port, dns_timeout = nil, connect_timeout = nil, blocking = false, family = Socket::Family::UNSPEC)
|
||||||
|
Addrinfo.tcp(host, port, timeout: dns_timeout, family: family) do |addrinfo|
|
||||||
|
super(addrinfo.family, addrinfo.type, addrinfo.protocol, blocking)
|
||||||
|
connect(addrinfo, timeout: connect_timeout) do |error|
|
||||||
|
close
|
||||||
|
error
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
{% end %}
|
||||||
end
|
end
|
||||||
|
|
||||||
# :ditto:
|
# :ditto:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user