diff options
| author | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-06-01 12:45:11 +0300 |
|---|---|---|
| committer | Hiroshi SHIBATA <hsbt@ruby-lang.org> | 2019-06-01 13:50:41 +0300 |
| commit | 56660de3c6df7a4ff8667ef4047d30d0de169935 (patch) | |
| tree | dd1e526075687b4b24e089cee50eabc21a6143cc /lib/rubygems/request | |
| parent | 560cd5b1f04f30542a294b3d77527d3b12f7cc15 (diff) | |
Merge rubygems master from upstream.
I picked the commit from 3c469e0da538428a0ddd94f99aa73c32da22e8ba
Diffstat (limited to 'lib/rubygems/request')
| -rw-r--r-- | lib/rubygems/request/connection_pools.rb | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb index 7c273d5465..9444239b2c 100644 --- a/lib/rubygems/request/connection_pools.rb +++ b/lib/rubygems/request/connection_pools.rb @@ -76,9 +76,7 @@ class Gem::Request::ConnectionPools # :nodoc: end def net_http_args(uri, proxy_uri) - # URI::Generic#hostname was added in ruby 1.9.3, use it if exists, otherwise - # don't support IPv6 literals and use host. - hostname = uri.respond_to?(:hostname) ? uri.hostname : uri.host + hostname = uri.hostname net_http_args = [hostname, uri.port] no_proxy = get_no_proxy_from_env |