Merge pull request #1256 from chef/ap/ssl-hang

Fix nil timeout and retries
This commit is contained in:
Christoph Hartmann 2016-10-27 10:17:00 +02:00 committed by GitHub
commit efb90c12d2

View file

@ -41,7 +41,7 @@ class SSL < Inspec.resource(1)
'tls1.2',
].freeze
attr_reader :host, :port
attr_reader :host, :port, :timeout, :retries
def initialize(opts = {})
@host = opts[:host]
@ -71,7 +71,7 @@ class SSL < Inspec.resource(1)
res = Parallel.map(groups, in_threads: 8) do |proto, e|
[proto, SSLShake.hello(x.resource.host, port: x.resource.port,
protocol: proto, ciphers: e.map(&:cipher),
timeout: @timeout, retries: @retries)]
timeout: x.resource.timeout, retries: x.resource.retries)]
end
Hash[res]
}