diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2019-01-22 06:28:04 +0000 |
| commit | 3dc6efbe9ca582d6930f25754a16043dedecfa6f (patch) | |
| tree | 35980c7383e9e12d092e0eff78f5f16eca2fa1fc /lib/rubygems/request.rb | |
| parent | 59a6215af65b3bfade13836681cbacc3294e6e78 (diff) | |
Merge rubygems master targeted RubyGems 3.1.0.
https://github.com/rubygems/rubygems/commit/1172320540c8c33c59fc1db5191b021c3b2db487
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request.rb')
| -rw-r--r-- | lib/rubygems/request.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb index fb164d79cf..d442f6534b 100644 --- a/lib/rubygems/request.rb +++ b/lib/rubygems/request.rb @@ -168,6 +168,7 @@ class Gem::Request no_env_proxy = env_proxy.nil? || env_proxy.empty? + return :no_proxy if scheme == 'https' && no_env_proxy return get_proxy_from_env 'http' if no_env_proxy and _scheme != 'http' return :no_proxy if no_env_proxy |