Skip to content

Commit 998d061

Browse files
author
Markus Jansen
committed
Merge pull request socketry#7 in EB/async-dns from bugfix/nlo/EB1-1907-dns-forwarding-query-upstream-fails-due-encoding-error to eblocker
* commit '1cf8843514dd236901a4d281b9132cf960f24156': [EB1-1907] Workaround for ruby's (< 2.3) object.inspect bug triggered by queries containing UTF-8 encoded characters.
2 parents d194feb + 1cf8843 commit 998d061

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Diff for: lib/async/dns/resolver.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,11 @@ def dispatch_request(message, options, task: Async::Task.current)
145145
request = Request.new(message, endpoints)
146146

147147
request.each do |endpoint|
148-
@logger.debug "[#{message.id}] Sending request #{message.question.inspect} to address #{endpoint.inspect}" if @logger
148+
begin
149+
@logger.debug "[#{message.id}] Sending request #{message.question.inspect} to address #{endpoint.inspect}" if @logger
150+
rescue Encoding::CompatibilityError
151+
@logger.debug "[#{message.id}] failed to log message question via inspect due to Encoding::CompatibilityError on ruby #{RUBY_VERSION}. Fixed in ruby >= 2.3" if @logger
152+
end
149153

150154
begin
151155
ip = endpoint.address.ip_address

Diff for: lib/async/dns/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@
2020

2121
module Async
2222
module DNS
23-
VERSION = '1.0.1'
23+
VERSION = '1.0.2'
2424
end
2525
end

0 commit comments

Comments
 (0)