about summary refs log tree commit diff
path: root/app/controllers
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-08-13 23:10:19 +0200
committerGitHub <noreply@github.com>2020-08-13 23:10:19 +0200
commit6fece522f9dca9d13ae2d4437b395a92ddb106c9 (patch)
tree882f9cf298e9dffa985f214b28a877b08cf19752 /app/controllers
parent660188c9008761ae38d0e82dea841f7d90e199f9 (diff)
parent0f71372d6337f695a87c7158c52b93e49acc215d (diff)
Merge pull request #1404 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/email_domain_blocks_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/admin/email_domain_blocks_controller.rb b/app/controllers/admin/email_domain_blocks_controller.rb
index c25919726..f7bdfb0c5 100644
--- a/app/controllers/admin/email_domain_blocks_controller.rb
+++ b/app/controllers/admin/email_domain_blocks_controller.rb
@@ -27,7 +27,7 @@ module Admin
           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 }