diff options
author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 03:30:02 +0000 |
---|---|---|
committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-14 03:30:02 +0000 |
commit | 4de117a61517e839f2c45eaf45d56fc243d6d5b2 (patch) | |
tree | 7cb5af7a7eb513e5dddf5e343746b1611e628387 /lib/rubygems/request | |
parent | e548c09d429a5136285ea81aed418685359ed124 (diff) | |
download | ruby-4de117a61517e839f2c45eaf45d56fc243d6d5b2.tar.gz |
* lib/rubygems: Update to RubyGems 2.4.1 master(713ab65)
Complete history at:
https://github.com/rubygems/rubygems/blob/master/History.txt#L3-L216
* test/rubygems: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47582 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rubygems/request')
-rw-r--r-- | lib/rubygems/request/connection_pools.rb | 79 | ||||
-rw-r--r-- | lib/rubygems/request/http_pool.rb | 38 | ||||
-rw-r--r-- | lib/rubygems/request/https_pool.rb | 10 |
3 files changed, 127 insertions, 0 deletions
diff --git a/lib/rubygems/request/connection_pools.rb b/lib/rubygems/request/connection_pools.rb new file mode 100644 index 0000000000..27ee99c20d --- /dev/null +++ b/lib/rubygems/request/connection_pools.rb @@ -0,0 +1,79 @@ +require 'thread' + +class Gem::Request::ConnectionPools # :nodoc: + + @client = Net::HTTP + + class << self + attr_accessor :client + end + + def initialize proxy_uri, cert_files + @proxy_uri = proxy_uri + @cert_files = cert_files + @pools = {} + @pool_mutex = Mutex.new + end + + def pool_for uri + http_args = net_http_args(uri, @proxy_uri) + key = http_args + [https?(uri)] + @pool_mutex.synchronize do + @pools[key] ||= + if https? uri then + Gem::Request::HTTPSPool.new(http_args, @cert_files, @proxy_uri) + else + Gem::Request::HTTPPool.new(http_args, @cert_files, @proxy_uri) + end + end + end + + private + + ## + # Returns list of no_proxy entries (if any) from the environment + + def get_no_proxy_from_env + env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY'] + + return [] if env_no_proxy.nil? or env_no_proxy.empty? + + env_no_proxy.split(/\s*,\s*/) + end + + def https? uri + uri.scheme.downcase == 'https' + end + + def no_proxy? host, env_no_proxy + host = host.downcase + + env_no_proxy.any? do |pattern| + pattern = pattern.downcase + + host[-pattern.length, pattern.length] == pattern or + (pattern.start_with? '.' and pattern[1..-1] == host) + end + end + + def net_http_args uri, proxy_uri + net_http_args = [uri.host, uri.port] + + no_proxy = get_no_proxy_from_env + + if proxy_uri and not no_proxy?(uri.host, no_proxy) then + net_http_args + [ + proxy_uri.host, + proxy_uri.port, + Gem::UriFormatter.new(proxy_uri.user).unescape, + Gem::UriFormatter.new(proxy_uri.password).unescape, + ] + elsif no_proxy? uri.host, no_proxy then + net_http_args += [nil, nil] + else + net_http_args + end + end + +end + diff --git a/lib/rubygems/request/http_pool.rb b/lib/rubygems/request/http_pool.rb new file mode 100644 index 0000000000..61c8884af7 --- /dev/null +++ b/lib/rubygems/request/http_pool.rb @@ -0,0 +1,38 @@ +## +# A connection "pool" that only manages one connection for now. Provides +# thread safe `checkout` and `checkin` methods. The pool consists of one +# connection that corresponds to `http_args`. This class is private, do not +# use it. + +class Gem::Request::HTTPPool # :nodoc: + attr_reader :cert_files, :proxy_uri + + def initialize http_args, cert_files, proxy_uri + @http_args = http_args + @cert_files = cert_files + @proxy_uri = proxy_uri + @queue = SizedQueue.new 1 + @queue << nil + end + + def checkout + @queue.pop || make_connection + end + + def checkin connection + @queue.push connection + end + + private + + def make_connection + setup_connection Gem::Request::ConnectionPools.client.new(*@http_args) + end + + def setup_connection connection + connection.start + connection + end + +end + diff --git a/lib/rubygems/request/https_pool.rb b/lib/rubygems/request/https_pool.rb new file mode 100644 index 0000000000..2e3da0a44e --- /dev/null +++ b/lib/rubygems/request/https_pool.rb @@ -0,0 +1,10 @@ +class Gem::Request::HTTPSPool < Gem::Request::HTTPPool # :nodoc: + private + + def setup_connection connection + Gem::Request.configure_connection_for_https(connection, @cert_files) + super + end +end + + |