Merge 8ab8edc0da into 94bceb8683

when resolving hostnames.

During development, it can be useful to add entries to `/etc/hosts`
in the Docker container (to test ActivityPub federation, e.g.).
The Socket implementation in Request currently ignores `/etc/hosts`,
and only consults DNS. This patch changes that.

app/lib/request.rb

@@ -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 = []