Merge RubyGems 3.0.0.beta1.

  * It drop to support < Ruby 2.2
  * Cleanup deprecated methods and classes.
  * Mark obsoleted methods to deprecate.
  * and other enhancements.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63528 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 16 insertions, 3 deletions

diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb
index 31fc609800..d70dea785a 100644
--- a/lib/rubygems/request/connection_pools.rb
+++ b/lib/rubygems/request/connection_pools.rb
@@ -54,10 +54,23 @@ class Gem::Request::ConnectionPools # :nodoc:
     host = host.downcase
 
     env_no_proxy.any? do |pattern|
-      pattern = pattern.downcase
+      env_no_proxy_pattern = pattern.downcase.dup
 
-      host[-pattern.length, pattern.length] == pattern or
-        (pattern.start_with? '.' and pattern[1..-1] == host)
+      # Remove dot in front of pattern for wildcard matching
+      env_no_proxy_pattern[0] = "" if env_no_proxy_pattern[0] == "."
+
+      host_tokens = host.split(".")
+      pattern_tokens = env_no_proxy_pattern.split(".")
+
+      intersection = (host_tokens - pattern_tokens) | (pattern_tokens - host_tokens)
+
+      # When we do the split into tokens we miss a dot character, so add it back if we need it
+      missing_dot = intersection.length > 0 ? 1 : 0
+      start = intersection.join(".").size + missing_dot
+
+      no_proxy_host = host[start..-1]
+
+      env_no_proxy_pattern == no_proxy_host
     end
   end