treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity

th: add support for /etc/hosts
ci/woodpecker/push/woodpecker Pipeline was successful Details 

Helped-by: Tim Perry <1526883+pimterry@users.noreply.github.com>
Helped-by: Jonathan de Jong <jo@jo.wtf>
Committed-by: kouhai <kouhai@treehouse.systems>
Fixes: https://github.com/mastodon/mastodon/issues/9436
main-rebase
demize 2024-04-15 00:38:24 -07:00 committed by kouhai
parent 6face4d0ee
commit 086da716d3
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/request.rb
View File

@ -261,11 +261,7 @@ class Request
begin begin
addresses = [IPAddr.new(host)] addresses = [IPAddr.new(host)]
rescue IPAddr::InvalidAddressError rescue IPAddr::InvalidAddressError
Resolv::DNS.open do |dns| addresses = Resolv::getaddresses(host)
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
end end
socks = [] socks = []