Merge branch 'master' into test_fix

Author: drbrain

.gitignore

@@ -3,3 +3,5 @@
 /TAGS
 /doc
 /pkg
+.idea
+/Gemfile.lock

.travis.yml

@@ -2,14 +2,23 @@
 after_script:
 - rake travis:after -t
 before_script:
-- gem install hoe-travis --no-rdoc --no-ri
+- gem install hoe-travis --no-document
 - rake travis:before -t
 language: ruby
 notifications:
   email:
   - [email protected]
 rvm:
-- 2.1.10
-- 2.2.5
-- 2.3.1
+- 2.1
+- 2.2
+- 2.3
+- 2.4
+- 2.5
+- 2.6
 script: rake travis
+install: "" # avoid running default bundler install
+
+matrix:
+  include:
+  - rvm: "2.6"
+    env: TRAVIS_MATRIX=pipeline

Gemfile

@@ -0,0 +1,15 @@
+# -*- ruby -*-
+
+# DO NOT EDIT THIS FILE. Instead, edit Rakefile, and run `rake bundler:gemfile`.
+
+source "https://rubygems.org/"
+
+gem "connection_pool", "~>2.2"
+
+gem "minitest", "~>5.11", :group => [:development, :test]
+gem "hoe-bundler", "~>1.5", :group => [:development, :test]
+gem "hoe-travis", "~>1.4", ">=1.4.1", :group => [:development, :test]
+gem "rdoc", ">=4.0", "<7", :group => [:development, :test]
+gem "hoe", "~>3.17", :group => [:development, :test]
+
+# vim: syntax=ruby

Manifest.txt

@@ -1,6 +1,7 @@
 .autotest
 .gemtest
 .travis.yml
+Gemfile
 History.txt
 Manifest.txt
 README.rdoc

README.rdoc

@@ -32,7 +32,7 @@ connection is kept alive between requests:
 
     uri = URI 'http://example.com/awesome/web/service'
 
-    http = Net::HTTP::Persistent.new 'my_app_name'
+    http = Net::HTTP::Persistent.new name: 'my_app_name'
 
     # perform a GET
     response = http.request uri

Rakefile

@@ -1,8 +1,8 @@
 # -*- ruby -*-
 
-require 'rubygems'
 require 'hoe'
 
+Hoe.plugin :bundler
 Hoe.plugin :git
 Hoe.plugin :minitest
 Hoe.plugin :travis
@@ -22,7 +22,10 @@ Hoe.spec 'net-http-persistent' do
 
   dependency 'connection_pool',   '~> 2.2'
   dependency 'minitest',          '~> 5.2', :development
-  dependency 'net-http-pipeline', '~> 1.0', :development
+  dependency 'hoe-bundler',       '~> 1.5', :development
+  dependency 'hoe-travis',        ['~> 1.4', '>= 1.4.1'], :development
+  dependency 'net-http-pipeline', '~> 1.0' if
+    ENV['TRAVIS_MATRIX'] == 'pipeline'
 end
 
 # vim: syntax=Ruby

lib/net/http/persistent.rb

@@ -33,7 +33,7 @@
 #
 #   uri = URI 'http://example.com/awesome/web/service'
 #
-#   http = Net::HTTP::Persistent.new 'my_app_name'
+#   http = Net::HTTP::Persistent.new name: 'my_app_name'
 #
 #   # perform a GET
 #   response = http.request uri
@@ -153,7 +153,7 @@
 #   uri = URI 'http://example.com/awesome/web/service'
 #   post_uri = uri + 'create'
 #
-#   http = Net::HTTP::Persistent.new 'my_app_name'
+#   http = Net::HTTP::Persistent.new name: 'my_app_name'
 #
 #   post = Net::HTTP::Post.new post_uri.path
 #   # ... fill in POST request
@@ -202,7 +202,11 @@ class Net::HTTP::Persistent
   ##
   # The default connection pool size is 1/4 the allowed open files.
 
-  DEFAULT_POOL_SIZE = Process.getrlimit(Process::RLIMIT_NOFILE).first / 4
+  if Gem.win_platform? then 
+    DEFAULT_POOL_SIZE = 256
+  else
+    DEFAULT_POOL_SIZE = Process.getrlimit(Process::RLIMIT_NOFILE).first / 4
+  end
 
   ##
   # The version of Net::HTTP::Persistent you are using
@@ -406,6 +410,11 @@ def self.detect_idle_timeout uri, max = 10
 
   attr_accessor :read_timeout
 
+  ##
+  # Seconds to wait until writing one block.  See Net::HTTP#write_timeout
+
+  attr_accessor :write_timeout
+
   ##
   # By default SSL sessions are reused to avoid extra SSL handshakes.  Set
   # this to false if you have problems communicating with an HTTPS server
@@ -440,10 +449,26 @@ def self.detect_idle_timeout uri, max = 10
   # SSL version to use.
   #
   # By default, the version will be negotiated automatically between client
-  # and server.  Ruby 1.9 and newer only.
+  # and server.  Ruby 1.9 and newer only. Deprecated since Ruby 2.5.
 
   attr_reader :ssl_version
 
+  ##
+  # Minimum SSL version to use, e.g. :TLS1_1
+  #
+  # By default, the version will be negotiated automatically between client
+  # and server.  Ruby 2.5 and newer only.
+
+  attr_reader :min_version
+
+  ##
+  # Maximum SSL version to use, e.g. :TLS1_2
+  #
+  # By default, the version will be negotiated automatically between client
+  # and server.  Ruby 2.5 and newer only.
+
+  attr_reader :max_version
+
   ##
   # Where this instance's last-use times live in the thread local variables
 
@@ -514,6 +539,7 @@ def initialize name: nil, proxy: nil, pool_size: DEFAULT_POOL_SIZE
     @keep_alive       = 30
     @open_timeout     = nil
     @read_timeout     = nil
+    @write_timeout    = nil
     @idle_timeout     = 5
     @max_requests     = nil
     @socket_options   = []
@@ -533,6 +559,8 @@ def initialize name: nil, proxy: nil, pool_size: DEFAULT_POOL_SIZE
     @private_key        = nil
     @ssl_timeout        = nil
     @ssl_version        = nil
+    @min_version        = nil
+    @max_version        = nil
     @verify_callback    = nil
     @verify_depth       = nil
     @verify_mode        = nil
@@ -607,8 +635,11 @@ def connection_for uri
 
     net_http_args = [uri.host, uri.port]
 
-    net_http_args.concat @proxy_args if
-      @proxy_uri and not proxy_bypass? uri.host, uri.port
+    if @proxy_uri and not proxy_bypass? uri.host, uri.port then
+      net_http_args.concat @proxy_args
+    else
+      net_http_args.concat [nil, nil, nil, nil]
+    end
 
     connection = @pool.checkout net_http_args
 
@@ -625,6 +656,7 @@ def connection_for uri
     end
 
     http.read_timeout = @read_timeout if @read_timeout
+    http.write_timeout = @write_timeout if @write_timeout && http.respond_to?(:write_timeout=)
     http.keep_alive_timeout = @idle_timeout if @idle_timeout
 
     return yield connection
@@ -744,7 +776,7 @@ def normalize_uri uri
 
   ##
   # Pipelines +requests+ to the HTTP server at +uri+ yielding responses if a
-  # block is given.  Returns all responses recieved.
+  # block is given.  Returns all responses received.
   #
   # See
   # Net::HTTP::Pipeline[http://docs.seattlerb.org/net-http-pipeline/Net/HTTP/Pipeline.html]
@@ -1030,9 +1062,7 @@ def request_setup req_or_uri # :nodoc:
   # #shutdown when you are completely done making requests!
 
   def shutdown
-    @pool.available.shutdown do |http|
-      http.finish
-    end
+    @pool.shutdown { |http| http.finish }
   end
 
   ##
@@ -1044,6 +1074,8 @@ def ssl connection
     connection.ciphers     = @ciphers     if @ciphers
     connection.ssl_timeout = @ssl_timeout if @ssl_timeout
     connection.ssl_version = @ssl_version if @ssl_version
+    connection.min_version = @min_version if @min_version
+    connection.max_version = @max_version if @max_version
 
     connection.verify_depth = @verify_depth
     connection.verify_mode  = @verify_mode
@@ -1115,6 +1147,24 @@ def ssl_version= ssl_version
     reconnect_ssl
   end
 
+  ##
+  # Minimum SSL version to use
+
+  def min_version= min_version
+    @min_version = min_version
+
+    reconnect_ssl
+  end
+
+  ##
+  # maximum SSL version to use
+
+  def max_version= max_version
+    @max_version = max_version
+
+    reconnect_ssl
+  end
+
   ##
   # Sets the depth of SSL certificate verification
 

lib/net/http/persistent/pool.rb

@@ -7,11 +7,11 @@ def initialize(options = {}, &block)
     super
 
     @available = Net::HTTP::Persistent::TimedStackMulti.new(@size, &block)
-    @key = :"current-#{@available.object_id}"
+    @key = "current-#{@available.object_id}"
   end
 
   def checkin net_http_args
-    stack = Thread.current[@key][net_http_args]
+    stack = Thread.current[@key][net_http_args] ||= []
 
     raise ConnectionPool::Error, 'no connections are checked out' if
       stack.empty?
@@ -20,14 +20,17 @@ def checkin net_http_args
 
     if stack.empty?
       @available.push conn, connection_args: net_http_args
+
+      Thread.current[@key].delete(net_http_args)
+      Thread.current[@key] = nil if Thread.current[@key].empty?
     end
 
     nil
   end
 
   def checkout net_http_args
-    stacks = Thread.current[@key] ||= Hash.new { |h, k| h[k] = [] }
-    stack  = stacks[net_http_args]
+    stacks = Thread.current[@key] ||= {}
+    stack  = stacks[net_http_args] ||= []
 
     if stack.empty? then
       conn = @available.pop connection_args: net_http_args
@@ -40,6 +43,10 @@ def checkout net_http_args
     conn
   end
 
+  def shutdown
+    Thread.current[@key] = nil
+    super
+  end
 end
 
 require 'net/http/persistent/timed_stack_multi'

test/test_net_http_persistent.rb

@@ -77,8 +77,8 @@ def teardown
   class BasicConnection
     attr_accessor :started, :finished, :address, :port, :use_ssl,
                   :read_timeout, :open_timeout, :keep_alive_timeout
-    attr_accessor :ciphers, :ssl_timeout, :ssl_version,
-                  :verify_depth, :verify_mode, :cert_store,
+    attr_accessor :ciphers, :ssl_timeout, :ssl_version, :min_version,
+                  :max_version, :verify_depth, :verify_mode, :cert_store,
                   :ca_file, :ca_path, :cert, :key
     attr_reader :req, :debug_output
     def initialize
@@ -120,7 +120,7 @@ def proxy_port
   def basic_connection
     raise "#{@uri} is not HTTP" unless @uri.scheme.downcase == 'http'
 
-    net_http_args = [@uri.host, @uri.port]
+    net_http_args = [@uri.host, @uri.port, nil, nil, nil, nil]
 
     connection = Net::HTTP::Persistent::Connection.allocate
     connection.ssl_generation = @http.ssl_generation
@@ -152,7 +152,7 @@ def r.read_body() :read_body end
   def ssl_connection
     raise "#{@uri} is not HTTPS" unless @uri.scheme.downcase == 'https'
 
-    net_http_args = [@uri.host, @uri.port]
+    net_http_args = [@uri.host, @uri.port, nil, nil, nil, nil]
 
     connection = Net::HTTP::Persistent::Connection.allocate
     connection.ssl_generation = @http.ssl_generation
@@ -279,7 +279,7 @@ def test_connection_for
       c
     end
 
-    stored = @http.pool.checkout ['example.com', 80]
+    stored = @http.pool.checkout ['example.com', 80, nil, nil, nil, nil]
 
     assert_same used, stored
   end
@@ -786,7 +786,7 @@ def test_proxy_equals_env
   def test_proxy_equals_nil
     @http.proxy = nil
 
-    assert_equal nil, @http.proxy_uri
+    assert_nil @http.proxy_uri
 
     assert_equal 1, @http.generation, 'generation'
     assert_equal 1, @http.ssl_generation, 'ssl_generation'
@@ -1094,7 +1094,7 @@ def test_request_connection_close_request
     assert_kind_of Net::HTTP::Get, req
     assert_equal '/path',      req.path
     assert_equal 'close',      req['connection']
-    assert_equal nil,          req['keep-alive']
+    assert_nil req['keep-alive']
 
     assert c.http.finished?
   end
@@ -1527,6 +1527,20 @@ def test_ssl_version_equals
     assert_equal 1, @http.ssl_generation
   end
 
+  def test_min_version_equals
+    @http.min_version = :min_version
+
+    assert_equal :min_version, @http.min_version
+    assert_equal 1, @http.ssl_generation
+  end
+
+  def test_max_version_equals
+    @http.max_version = :max_version
+
+    assert_equal :max_version, @http.max_version
+    assert_equal 1, @http.ssl_generation
+  end
+
   def test_start
     c = basic_connection
     c = c.http