Merge branch 'master' into glitch-soc/merge-upstream

2020-08-13 22:17:29 +02:00
parent 660188c900 0f38f9726a
commit da62e350e0
14 changed files with 72 additions and 30 deletions
--- a/lib/mastodon/email_domain_blocks_cli.rb
+++ b/lib/mastodon/email_domain_blocks_cli.rb
@ -63,7 +63,7 @@ module Mastodon
        ips       = []

        Resolv::DNS.open do |dns|
-          dns.timeouts = 1
+          dns.timeouts = 5
          hostnames = dns.getresources(email_domain_block.domain, Resolv::DNS::Resource::IN::MX).to_a.map { |e| e.exchange.to_s }

          ([email_domain_block.domain] + hostnames).uniq.each do |hostname|