diff options
| author | Hiroshi SHIBATA <[email protected]> | 2022-08-09 11:16:07 +0900 |
|---|---|---|
| committer | Hiroshi SHIBATA <[email protected]> | 2022-08-09 12:05:19 +0900 |
| commit | 44264b4fee1e208e759710c39271186ff9856b40 (patch) | |
| tree | 939a9810293c86553e7b600bce9fb426776f6000 /lib/rubygems/request.rb | |
| parent | f8936b3341376948112e31f9e9b0cb3ad6e91e7c (diff) | |
Merge rubygems/bundler HEAD.
Pick from https://github.com/rubygems/rubygems/commit/dfbb5a38114640e0d8d616861607f3de73ee0199
Notes
Notes:
Merged: https://github.com/ruby/ruby/pull/6224
Diffstat (limited to 'lib/rubygems/request.rb')
| -rw-r--r-- | lib/rubygems/request.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/rubygems/request.rb b/lib/rubygems/request.rb index d15ba91209..c3ea46e0eb 100644 --- a/lib/rubygems/request.rb +++ b/lib/rubygems/request.rb @@ -173,7 +173,7 @@ class Gem::Request require "uri" uri = URI(Gem::UriFormatter.new(env_proxy).normalize) - if uri and uri.user.nil? and uri.password.nil? + if uri && uri.user.nil? && uri.password.nil? user = ENV["#{_scheme}_proxy_user"] || ENV["#{_SCHEME}_PROXY_USER"] password = ENV["#{_scheme}_proxy_pass"] || ENV["#{_SCHEME}_PROXY_PASS"] |