mirror of
https://github.com/mastodon/mastodon.git
synced 2025-05-07 12:16:14 +00:00
Merge 8ab8edc0da
into fbe9728f36
This commit is contained in:
commit
458c273b0b
|
@ -266,8 +266,9 @@ class Request
|
|||
Resolv::DNS.open do |dns|
|
||||
dns.timeouts = 5
|
||||
addresses = dns.getaddresses(host)
|
||||
addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
|
||||
end
|
||||
addresses.concat(Resolv::Hosts.new().getaddresses(host))
|
||||
addresses = addresses.filter { |addr| addr.is_a?(Resolv::IPv6) }.take(2) + addresses.filter { |addr| !addr.is_a?(Resolv::IPv6) }.take(2)
|
||||
end
|
||||
|
||||
socks = []
|
||||
|
|
Loading…
Reference in New Issue
Block a user