gnh1201/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2025-05-28 20:47:10 +00:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity

Merge 8ab8edc0da into fbe9728f36

Browse Source
This commit is contained in:
Michael 2025-05-06 15:05:46 +00:00 committed by GitHub
commit 458c273b0b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/lib/request.rb
View File

@ -266,8 +266,9 @@ class Request
Resolv::DNS.open do |dns| Resolv::DNS.open do |dns|
dns.timeouts = 5 dns.timeouts = 5
addresses = dns.getaddresses(host) 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 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 end
socks = [] socks = []