diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 15:09:26 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-02-17 15:09:26 +0300 |
| commit | 75a4eaade04ee758bb3b253f27bf1c20c67991f0 (patch) | |
| tree | 779b3011793bf35770774dbaa51eec55efd320cd /lib/gitlab/url_blocker.rb | |
| parent | 839e879bcf197a283da8481ddcb15b177172784d (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/url_blocker.rb')
| -rw-r--r-- | lib/gitlab/url_blocker.rb | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/lib/gitlab/url_blocker.rb b/lib/gitlab/url_blocker.rb index 5403017d710..10822f943b6 100644 --- a/lib/gitlab/url_blocker.rb +++ b/lib/gitlab/url_blocker.rb @@ -7,9 +7,6 @@ module Gitlab class UrlBlocker BlockedUrlError = Class.new(StandardError) - GETADDRINFO_TIMEOUT_SECONDS = 15 - private_constant :GETADDRINFO_TIMEOUT_SECONDS - class << self # Validates the given url according to the constraints specified by arguments. # @@ -113,7 +110,7 @@ module Gitlab end def get_address_info(uri, dns_rebind_protection) - Addrinfo.getaddrinfo(uri.hostname, get_port(uri), nil, :STREAM, timeout: GETADDRINFO_TIMEOUT_SECONDS).map do |addr| + Addrinfo.getaddrinfo(uri.hostname, get_port(uri), nil, :STREAM).map do |addr| addr.ipv6_v4mapped? ? addr.ipv6_to_ipv4 : addr end rescue SocketError |