1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fallback to TCP in resolv if UDP bind raises EACCES

Browse Source 
Original patch from Andy Grimm.

Fixes [Bug #10747]
This commit is contained in:
Jeremy Evans 2019-07-07 18:51:42 -07:00
parent 62d4382877
commit f37cc1c719
Notes: git 2019-10-22 04:49:05 +09:00 
Merged: https://github.com/ruby/ruby/pull/2587
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/resolv.rb
View File

@ -514,10 +514,15 @@ class Resolv
def fetch_resource(name, typeclass) def fetch_resource(name, typeclass)
lazy_initialize lazy_initialize
requester = make_udp_requester begin
requester = make_udp_requester
rescue Errno::EACCES
# fall back to TCP
end
senders = {} senders = {}
begin begin
@config.resolv(name) {|candidate, tout, nameserver, port| @config.resolv(name) {|candidate, tout, nameserver, port|
requester ||= make_tcp_requester(nameserver, port)
msg = Message.new msg = Message.new
msg.rd = 1 msg.rd = 1
msg.add_question(candidate, typeclass) msg.add_question(candidate, typeclass)
@ -550,7 +555,7 @@ class Resolv
end end
} }
ensure ensure
requester.close requester&.close
end end
end end