excon 0.101.0 → 0.103.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80e84893b8e820b92e6d8a98659f5e253b2e3ef1702762b2e9a581d02293b726
-  data.tar.gz: 1b4d8e9c815f11db2569fc7c9a7624c829564469b48b4e636d51aaeb5214df60
+  metadata.gz: 2c1759dde8542ab4e6147d2c51ce7e674d4fdd46b48f0aed3a77ed823917d336
+  data.tar.gz: 5c4c66737d283ed9d4d186cd46809c5c2fd0fc346c06564140b39a131fdfb44f
 SHA512:
-  metadata.gz: 0a2aab3a6183402b262c8dafab16b9ab7bb953e0b506b3ba84a066f507744b2ef45bb12615f72fec03495af420d1d2b0dacbf45435e6ed60b544e642487bc569
-  data.tar.gz: 31085df3ec377c67f8765513d96ab09ebdfa592c850af5ff75fd322ebedc5a9a602945d7b81f3af6041d1156268f3ae622e6e1c25e82a2e977b401bdbf11610b
+  metadata.gz: 803189e9d2dc991e48114c4f5ec7071ff04e4ea3f88d6872b3bcfe066cda38055c98b44cad83e5b9edabb677684b75c1a673c232303826a87857ba214c75cf6b
+  data.tar.gz: cab31317bdbc12398a33ce0b4a385584ca5c3e1cd2be2b201fb5e7ac0161b330e235d0ecd489fa304356367ab98fc868cc610d3afaf12bd3b4636ea182cda92e

data/README.md

@@ -191,6 +191,11 @@ connection = Excon.new('http://geemus.com/', :connect_timeout => 360)
 
 # opt-out of nonblocking operations for performance and/or as a workaround
 connection = Excon.new('http://geemus.com/', :nonblock => false)
+
+# set up desired dns_timeouts for resolving addresses (default is set by Resolv)
+# it accepts an integer or an array of integers for retrying with different timeouts
+# see Resolv::DNS#timeouts for more details (https://ruby-doc.org/3.2.2/stdlibs/resolv/Resolv/DNS.html#method-i-timeouts-3D)
+connection = Excon.new('http://geemus.com/', :dns_timeouts => 3)
 ```
 
 ## Chunked Requests

data/lib/excon/connection.rb

@@ -246,9 +246,9 @@ module Excon
 
       host_key = datum[:headers].keys.detect {|k| k.casecmp('Host') == 0 } || 'Host'
       if datum[:scheme] == UNIX
-        datum[:headers][host_key]   ||= ''
+        datum[:headers][host_key] ||= ''
       else
-        datum[:headers][host_key]   ||= datum[:host] + port_string(datum)
+        datum[:headers][host_key] ||= datum[:host] + port_string(datum)
       end
 
       # RFC 7230, section 5.4, states that the Host header SHOULD be the first one # to be present.

data/lib/excon/constants.rb

@@ -46,6 +46,7 @@ module Excon
     :chunk_size,
     :debug_request,
     :debug_response,
+    :dns_timeouts,
     :headers,
     :instrumentor, # Used for setting logging within Connection
     :logger,
@@ -134,41 +135,43 @@ module Excon
   end
   # these come last as they rely on the above
   DEFAULTS = {
-    :chunk_size           => CHUNK_SIZE || DEFAULT_CHUNK_SIZE,
+    :chunk_size          => CHUNK_SIZE || DEFAULT_CHUNK_SIZE,
     # see https://wiki.mozilla.org/Security/Server_Side_TLS#Intermediate_compatibility_.28default.29
     # list provided then had DES related things sorted to the end
-    :ciphers              => 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:DES-CBC3-SHA:!DSS',
-    :connect_timeout      => 60,
-    :debug_request        => false,
-    :debug_response       => false,
-    :headers              => {
+    :ciphers             => 'ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA256:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:ECDHE-ECDSA-DES-CBC3-SHA:ECDHE-RSA-DES-CBC3-SHA:EDH-RSA-DES-CBC3-SHA:DES-CBC3-SHA:!DSS',
+    :connect_timeout     => 60,
+    :debug_request       => false,
+    :debug_response      => false,
+    :dns_timeouts        => nil,
+    # nil allows Resolv::DNS to set its default timeouts value (see https://ruby-doc.org/3.2.2/stdlibs/resolv/Resolv/DNS.html#method-i-timeouts-3D)
+    :headers             => {
       'User-Agent' => USER_AGENT,
       'Accept'     =>  '*/*'
     },
-    :idempotent           => false,
-    :instrumentor_name    => 'excon',
-    :middlewares          => [
+    :idempotent          => false,
+    :instrumentor_name   => 'excon',
+    :middlewares         => [
       Excon::Middleware::ResponseParser,
       Excon::Middleware::Expects,
       Excon::Middleware::Idempotent,
       Excon::Middleware::Instrumentor,
       Excon::Middleware::Mock
     ],
-    :mock                 => false,
-    :nonblock             => true,
-    :omit_default_port    => false,
-    :persistent           => false,
-    :read_timeout         => 60,
-    :retry_errors         => DEFAULT_RETRY_ERRORS,
-    :retry_limit          => DEFAULT_RETRY_LIMIT,
-    :ssl_verify_peer      => true,
-    :ssl_uri_schemes      => [HTTPS],
-    :stubs                => :global,
-    :tcp_nodelay          => false,
-    :thread_safe_sockets  => true,
-    :uri_parser           => URI,
-    :versions             => VERSIONS,
-    :write_timeout        => 60
+    :mock                => false,
+    :nonblock            => true,
+    :omit_default_port   => false,
+    :persistent          => false,
+    :read_timeout        => 60,
+    :retry_errors        => DEFAULT_RETRY_ERRORS,
+    :retry_limit         => DEFAULT_RETRY_LIMIT,
+    :ssl_verify_peer     => true,
+    :ssl_uri_schemes     => [HTTPS],
+    :stubs               => :global,
+    :tcp_nodelay         => false,
+    :thread_safe_sockets => true,
+    :uri_parser          => URI,
+    :versions            => VERSIONS,
+    :write_timeout       => 60
   }
 
 end

data/lib/excon/socket.rb

@@ -121,7 +121,10 @@ module Excon
         family = @data[:proxy][:family]
       end
 
-      Resolv.each_address(hostname) do |ip|
+      dns_resolver = Resolv::DNS.new
+      dns_resolver.timeouts = @data[:dns_timeouts]
+      resolver = Resolv.new([Resolv::Hosts.new, dns_resolver])
+      resolver.each_address(hostname) do |ip|
         # already succeeded on previous addrinfo
         if @socket
           break

data/lib/excon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excon
-  VERSION = '0.101.0'
+  VERSION = '0.103.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.101.0
+  version: 0.103.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-23 00:00:00.000000000 Z
+date: 2023-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec