From 3dc6efbe9ca582d6930f25754a16043dedecfa6f Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 22 Jan 2019 06:28:04 +0000
Subject: 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
---
 lib/rubygems/request.rb | 1 +
 1 file changed, 1 insertion(+)

(limited to 'lib/rubygems/request.rb')

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
 
-- 
cgit v1.2.3