about summary refs log tree commit diff
path: root/app/lib/request.rb
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-11-10 13:27:40 +0100
committerGitHub <noreply@github.com>2022-11-10 13:27:40 +0100
commitee7e49d1b1323618e16026bc8db8ab7f9459cc2d (patch)
tree86d51ac7c13d2b08fae534a44524c2ef8b131315 /app/lib/request.rb
parentb2a25d446a9f4368ad9d1240b9da30bc33942da5 (diff)
parentc4d2c729245fab1dda31d0de73be9bc03217b06a (diff)
Merge pull request #1910 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/request.rb')
-rw-r--r--app/lib/request.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/lib/request.rb b/app/lib/request.rb
index 1ea86862d..dd198f399 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -199,7 +199,8 @@ class Request
         rescue IPAddr::InvalidAddressError
           Resolv::DNS.open do |dns|
             dns.timeouts = 5
-            addresses = dns.getaddresses(host).take(2)
+            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