Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions lib/vault/persistent.rb
Original file line number Diff line number Diff line change
Expand Up @@ -603,10 +603,10 @@ def ciphers= ciphers
def connection_for uri
use_ssl = uri.scheme.downcase == 'https'

net_http_args = [uri.host, uri.port]
net_http_args = [uri.hostname, uri.port]

net_http_args.concat @proxy_args if
@proxy_uri and not proxy_bypass? uri.host, uri.port
@proxy_uri and not proxy_bypass? uri.hostname, uri.port

connection = @pool.checkout net_http_args

Expand Down Expand Up @@ -715,7 +715,7 @@ def finish connection
# Returns the HTTP protocol version for +uri+

def http_version uri
@http_versions["#{uri.host}:#{uri.port}"]
@http_versions["#{uri.hostname}:#{uri.port}"]
end

##
Expand Down Expand Up @@ -798,7 +798,7 @@ def proxy= proxy

if @proxy_uri then
@proxy_args = [
@proxy_uri.host,
@proxy_uri.hostname,
@proxy_uri.port,
unescape(@proxy_uri.user),
unescape(@proxy_uri.password),
Expand Down Expand Up @@ -973,7 +973,7 @@ def request uri, req = nil, &block
end
end

@http_versions["#{uri.host}:#{uri.port}"] ||= response.http_version
@http_versions["#{uri.hostname}:#{uri.port}"] ||= response.http_version

response
end
Expand Down