net-http-persistent 2.4.1 → 2.5

data/History.txt

@@ -1,6 +1,23 @@
+=== 2.5 / 2012-02-07
+
+* Minor enhancements
+  * The proxy may be changed at any time.
+  * The allowed SSL version may now be set via #ssl_version.
+    Issue #16 by astera
+  * Added Net::HTTP::Persistent#override_headers which allows overriding
+  * Net::HTTP default headers like User-Agent.  See
+    Net::HTTP::Persistent@Headers for details.  Issue #17 by andkerosine
+
+* Bug fixes
+  * The ruby 1.8 speed monkeypatch now handles EAGAIN for windows users.
+    Issue #12 by Alwyn Schoeman
+  * Fixed POST example in README.  Submitted by injekt.
+  * Fixed various bugs in the shutdown of connections especially cross-thread
+    (which you shouldn't be doing anyways).
+
 === 2.4.1 / 2012-02-03
 
-* Bug fix
+* Bug fixes
   * When FakeWeb or WebMock are loaded SSL sessions will not be reused to
     prevent breakage of testing frameworks.  Issue #13 by Matt Brictson, pull
     request #14 by Zachary Scott
@@ -10,7 +27,7 @@
 
 === 2.4 / 2012-01-31
 
-* Minor Enhancement
+* Minor enhancement
   * net-http-persistent now complains if OpenSSL::SSL::VERIFY_PEER is equal to
     OpenSSL::SSL::VERIFY_NONE.  If you have a platform that is broken this way
     you must define the constant:

data/README.rdoc

@@ -29,21 +29,21 @@ The following example will make two requests to the same server.  The
 connection is kept alive between requests:
 
     require 'net/http/persistent'
-    
+
     uri = URI 'http://example.com/awesome/web/service'
-    
+
     http = Net::HTTP::Persistent.new 'my_app_name'
-    
+
     # perform a GET
     response = http.request uri
-    
+
     # create a POST
     post_uri = uri + 'create'
     post = Net::HTTP::Post.new post_uri.path
     post.set_form_data 'some' => 'cool data'
-    
+
     # perform the POST, the URI is always required
-    response http.request post_uri, post
+    response = http.request post_uri, post
 
 Please see the documentation for +Net::HTTP::Persistent+ for more information,
 including how to handle SSL connections.

data/lib/net/http/faster.rb

@@ -13,7 +13,7 @@ class Net::BufferedIO #:nodoc:
     if @io.respond_to? :read_nonblock then
       begin
         @rbuf << @io.read_nonblock(65536)
-      rescue Errno::EWOULDBLOCK => e
+      rescue Errno::EWOULDBLOCK, Errno::EAGAIN => e
         retry if IO.select [@io], nil, nil, @read_timeout
         raise Timeout::Error, e.message
       end

data/lib/net/http/persistent.rb

@@ -60,14 +60,28 @@ end
 # #private_key        :: The client's SSL private key
 # #reuse_ssl_sessions :: Reuse a previously opened SSL session for a new
 #                        connection
+# #ssl_version        :: Which specific SSL version to use
 # #verify_callback    :: For server certificate verification
 # #verify_mode        :: How connections should be verified
 #
 # == Proxies
 #
-# A proxy can be used either by providing a URI as the second argument of
-# ::new or by giving <code>:ENV</code> as the second argument which will
-# consult environment variables.  See proxy_from_env for details.
+# A proxy can be set through #proxy= or at initialization time by providing a
+# second argument to ::new.  The proxy may be the URI of the proxy server or
+# <code>:ENV</code> which will consult environment variables.
+#
+# See #proxy= and #proxy_from_env for details.
+#
+# == Headers
+#
+# Headers may be specified for use in every request.  #headers are appended to
+# any headers on the request.  #override_headers replace existing headers on
+# the request.
+#
+# The difference between the two can be seen in setting the User-Agent.  Using
+# <code>http.headers['User-Agent'] = 'MyUserAgent'</code> will send "Ruby,
+# MyUserAgent" while <code>http.override_headers['User-Agent'] =
+# 'MyUserAgent'</code> will send "MyUserAgent".
 #
 # == Tuning
 #
@@ -96,6 +110,14 @@ end
 # The amount of time to wait for a connection to be opened.  Set through
 # #open_timeout.
 #
+# === Idle Timeout
+#
+# If a connection has not been used in this many seconds it will be reset when
+# a request would use the connection.  The default idle timeout is unlimited.
+# If you know the server's idle timeout setting this value will eliminate
+# failures from attempting non-idempotent requests on closed connections.  Set
+# through #idle_timeout.
+#
 # === Socket Options
 #
 # Socket options may be set on newly-created connections.  See #socket_options
@@ -107,8 +129,9 @@ end
 # setting retry_change_requests to true requests will automatically be retried
 # once.
 #
-# Only do this when you know that retrying a POST is safe for your
-# application and will not create duplicate resources.
+# Only do this when you know that retrying a POST or other non-idempotent
+# request is safe for your application and will not create duplicate
+# resources.
 #
 # The recommended way to handle non-idempotent requests is the following:
 #
@@ -149,7 +172,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.4.1'
+  VERSION = '2.5'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -175,11 +198,6 @@ class Net::HTTP::Persistent
 
   attr_reader :cert_store
 
-  ##
-  # Where this instance's connections live in the thread local variables
-
-  attr_reader :connection_key # :nodoc:
-
   ##
   # Sends debug_output to this IO via Net::HTTP#set_debug_output.
   #
@@ -189,7 +207,17 @@ class Net::HTTP::Persistent
   attr_accessor :debug_output
 
   ##
-  # Headers that are added to every request
+  # Current connection generation
+
+  attr_reader :generation # :nodoc:
+
+  ##
+  # Where this instance's connections live in the thread local variables
+
+  attr_reader :generation_key # :nodoc:
+
+  ##
+  # Headers that are added to every request using Net::HTTP#add_field
 
   attr_reader :headers
 
@@ -227,6 +255,11 @@ class Net::HTTP::Persistent
 
   attr_accessor :open_timeout
 
+  ##
+  # Headers that are added to every request using Net::HTTP#[]=
+
+  attr_reader :override_headers
+
   ##
   # This client's SSL private key
 
@@ -267,11 +300,24 @@ class Net::HTTP::Persistent
 
   attr_reader :socket_options
 
+  ##
+  # Current SSL connection generation
+
+  attr_reader :ssl_generation # :nodoc:
+
   ##
   # Where this instance's SSL connections live in the thread local variables
 
   attr_reader :ssl_generation_key # :nodoc:
 
+  ##
+  # SSL version to use.
+  #
+  # By default, the version will be negotiated automatically between client
+  # and server.  Ruby 1.9 and newer only.
+
+  attr_reader :ssl_version if RUBY_VERSION > '1.9'
+
   ##
   # Where this instance's last-use times live in the thread local variables
 
@@ -304,8 +350,6 @@ class Net::HTTP::Persistent
 
   attr_accessor :retry_change_requests
 
-  attr_reader :ssl_generation # :nodoc:
-
   ##
   # Creates a new Net::HTTP::Persistent.
   #
@@ -326,38 +370,22 @@ class Net::HTTP::Persistent
   def initialize name = nil, proxy = nil
     @name = name
 
-    @proxy_uri = case proxy
-                 when :ENV      then proxy_from_env
-                 when URI::HTTP then proxy
-                 when nil       then # ignore
-                 else raise ArgumentError, 'proxy must be :ENV or a URI::HTTP'
-                 end
-
-    if @proxy_uri then
-      @proxy_args = [
-        @proxy_uri.host,
-        @proxy_uri.port,
-        @proxy_uri.user,
-        @proxy_uri.password,
-      ]
-
-      @proxy_connection_id = [nil, *@proxy_args].join ':'
-    end
-
-    @debug_output   = nil
-    @headers        = {}
-    @http_versions  = {}
-    @keep_alive     = 30
-    @open_timeout   = nil
-    @read_timeout   = nil
-    @idle_timeout   = 5
-    @socket_options = []
+    @debug_output     = nil
+    @proxy_uri        = nil
+    @headers          = {}
+    @override_headers = {}
+    @http_versions    = {}
+    @keep_alive       = 30
+    @open_timeout     = nil
+    @read_timeout     = nil
+    @idle_timeout     = 5
+    @socket_options   = []
 
     @socket_options << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
       Socket.const_defined? :TCP_NODELAY
 
     key = ['net_http_persistent', name].compact
-    @connection_key     = [key, 'connections'    ].join('_').intern
+    @generation_key     = [key, 'generations'    ].join('_').intern
     @ssl_generation_key = [key, 'ssl_generations'].join('_').intern
     @request_key        = [key, 'requests'       ].join('_').intern
     @timeout_key        = [key, 'timeouts'       ].join('_').intern
@@ -365,14 +393,18 @@ class Net::HTTP::Persistent
     @certificate        = nil
     @ca_file            = nil
     @private_key        = nil
+    @ssl_version        = nil
     @verify_callback    = nil
     @verify_mode        = OpenSSL::SSL::VERIFY_PEER
     @cert_store         = nil
 
+    @generation         = 0 # incremented when proxy URI changes
     @ssl_generation     = 0 # incremented when SSL session variables change
     @reuse_ssl_sessions = true
 
     @retry_change_requests = false
+
+    self.proxy = proxy if proxy
   end
 
   ##
@@ -403,12 +435,33 @@ class Net::HTTP::Persistent
     reconnect_ssl
   end
 
+  ##
+  # Finishes all connections on the given +thread+ that were created before
+  # the given +generation+ in the threads +generation_key+ list.
+  #
+  # See #shutdown for a bunch of scary warning about misusing this method.
+
+  def cleanup(generation, thread = Thread.current,
+              generation_key = @generation_key) # :nodoc:
+    timeouts = thread[@timeout_key]
+
+    (0...generation).each do |generation|
+      conns = thread[generation_key].delete generation
+
+      conns.each_value do |conn|
+        finish conn, thread
+
+        timeouts.delete conn.object_id if timeouts
+      end if conns
+    end
+  end
+
   ##
   # Creates a new connection for +uri+
 
   def connection_for uri
+    Thread.current[@generation_key]     ||= Hash.new { |h,k| h[k] = {} }
     Thread.current[@ssl_generation_key] ||= Hash.new { |h,k| h[k] = {} }
-    Thread.current[@connection_key]     ||= {}
     Thread.current[@request_key]        ||= Hash.new 0
     Thread.current[@timeout_key]        ||= Hash.new EPOCH
 
@@ -421,7 +474,11 @@ class Net::HTTP::Persistent
 
       connections = Thread.current[@ssl_generation_key][ssl_generation]
     else
-      connections = Thread.current[@connection_key]
+      generation = @generation
+
+      cleanup generation
+
+      connections = Thread.current[@generation_key][generation]
     end
 
     net_http_args = [uri.host, uri.port]
@@ -490,8 +547,10 @@ class Net::HTTP::Persistent
   ##
   # Finishes the Net::HTTP +connection+
 
-  def finish connection
-    Thread.current[@request_key].delete connection.object_id
+  def finish connection, thread = Thread.current
+    if requests = thread[@request_key] then
+      requests.delete connection.object_id
+    end
 
     connection.finish
   rescue IOError
@@ -603,6 +662,41 @@ class Net::HTTP::Persistent
     reconnect_ssl
   end
 
+  ##
+  # Sets the proxy server.  The +proxy+ may be the URI of the proxy server,
+  # the symbol +:ENV+ which will read the proxy from the environment or nil to
+  # disable use of a proxy.  See #proxy_from_env for details on setting the
+  # proxy from the environment.
+  #
+  # If the proxy URI is set after requests have been made, the next request
+  # will shut-down and re-open all connections.
+  #
+  # If you are making some requests through a proxy and others without a proxy
+  # use separate Net::Http::Persistent instances.
+
+  def proxy= proxy
+    @proxy_uri = case proxy
+                 when :ENV      then proxy_from_env
+                 when URI::HTTP then proxy
+                 when nil       then # ignore
+                 else raise ArgumentError, 'proxy must be :ENV or a URI::HTTP'
+                 end
+
+    if @proxy_uri then
+      @proxy_args = [
+        @proxy_uri.host,
+        @proxy_uri.port,
+        @proxy_uri.user,
+        @proxy_uri.password,
+      ]
+
+      @proxy_connection_id = [nil, *@proxy_args].join ':'
+    end
+
+    reconnect
+    reconnect_ssl
+  end
+
   ##
   # Creates a URI for an HTTP proxy server from ENV variables.
   #
@@ -612,7 +706,7 @@ class Net::HTTP::Persistent
   # indicated user and password unless HTTP_PROXY contains either of these in
   # the URI.
   #
-  # For Windows users lowercase ENV variables are preferred over uppercase ENV
+  # For Windows users, lowercase ENV variables are preferred over uppercase ENV
   # variables.
 
   def proxy_from_env
@@ -630,6 +724,13 @@ class Net::HTTP::Persistent
     uri
   end
 
+  ##
+  # Forces reconnection of HTTP connections.
+
+  def reconnect
+    @generation += 1
+  end
+
   ##
   # Forces reconnection of SSL connections.
 
@@ -671,10 +772,14 @@ class Net::HTTP::Persistent
 
     req = Net::HTTP::Get.new uri.request_uri unless req
 
-    headers.each do |pair|
+    @headers.each do |pair|
       req.add_field(*pair)
     end
 
+    @override_headers.each do |name, value|
+      req[name] = value
+    end
+
     unless req['Connection'] then
       req.add_field 'Connection', 'keep-alive'
       req.add_field 'Keep-Alive', @keep_alive
@@ -743,22 +848,14 @@ class Net::HTTP::Persistent
   # best to call #shutdown in the thread at the appropriate time instead!
 
   def shutdown thread = Thread.current
-    connections = thread[@connection_key]
-
-    connections.each do |_, connection|
-      begin
-        connection.finish
-      rescue IOError
-      end
-    end if connections
+    generation = reconnect
+    cleanup generation, thread, @generation_key
 
     ssl_generation = reconnect_ssl
+    cleanup ssl_generation, thread, @ssl_generation_key
 
-    ssl_cleanup ssl_generation
-
-    thread[@connection_key] = nil
-    thread[@request_key]    = nil
-    thread[@timeout_key]    = nil
+    thread[@request_key] = nil
+    thread[@timeout_key] = nil
   end
 
   ##
@@ -785,6 +882,8 @@ class Net::HTTP::Persistent
   def ssl connection
     connection.use_ssl = true
 
+    connection.ssl_version = @ssl_version if @ssl_version
+
     connection.verify_mode = @verify_mode
 
     if OpenSSL::SSL::VERIFY_PEER == OpenSSL::SSL::VERIFY_NONE and
@@ -838,17 +937,18 @@ application:
   # Finishes all connections that existed before the given SSL parameter
   # +generation+.
 
-  def ssl_cleanup generation
-    (0...ssl_generation).each do |generation|
-      ssl_conns = Thread.current[@ssl_generation_key].delete generation
+  def ssl_cleanup generation # :nodoc:
+    cleanup generation, Thread.current, @ssl_generation_key
+  end
 
-      ssl_conns.each_value do |ssl_conn|
-        finish ssl_conn
+  ##
+  # SSL version to use
 
-        Thread.current[@timeout_key].delete ssl_conn.object_id
-      end if ssl_conns
-    end
-  end
+  def ssl_version= ssl_version
+    @ssl_version = ssl_version
+
+    reconnect_ssl
+  end if RUBY_VERSION > '1.9'
 
   ##
   # Sets the HTTPS verify mode.  Defaults to OpenSSL::SSL::VERIFY_PEER.

data/test/test_net_http_persistent.rb

@@ -95,7 +95,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     raise "#{@uri} is not HTTP" unless @uri.scheme.downcase == 'http'
 
     c = BasicConnection.new
-    conns["#{@uri.host}:#{@uri.port}"] = c
+    conns[0]["#{@uri.host}:#{@uri.port}"] = c
     c
   end
 
@@ -117,7 +117,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def conns
-    Thread.current[@http.connection_key] ||= {}
+    Thread.current[@http.generation_key] ||= Hash.new { |h,k| h[k] = {} }
   end
 
   def reqs
@@ -148,14 +148,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 'name', http.name
   end
 
-  def test_initialize_env
-    ENV['HTTP_PROXY'] = 'proxy.example'
-    http = Net::HTTP::Persistent.new nil, :ENV
-
-    assert_equal URI.parse('http://proxy.example'), http.proxy_uri
-  end
-
-  def test_initialize_uri
+  def test_initialize_proxy
     proxy_uri = URI.parse 'http://proxy.example'
 
     http = Net::HTTP::Persistent.new nil, proxy_uri
@@ -197,8 +190,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 123, c.open_timeout
     assert_equal 321, c.read_timeout
 
-    assert_includes conns.keys, 'example.com:80'
-    assert_same c, conns['example.com:80']
+    assert_includes conns[0].keys, 'example.com:80'
+    assert_same c, conns[0]['example.com:80']
 
     socket = c.instance_variable_get :@socket
     expected = if Socket.const_defined? :TCP_NODELAY then
@@ -213,7 +206,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   def test_connection_for_cached
     cached = basic_connection
     cached.start
-    conns['example.com:80'] = cached
+    conns[0]['example.com:80'] = cached
 
     c = @http.connection_for @uri
 
@@ -237,7 +230,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert c.started?
 
     assert_includes conns.keys, 'example.com:80'
-    assert_same c, conns['example.com:80']
+    assert_same c, conns[0]['example.com:80']
 
     socket = c.instance_variable_get :@socket
 
@@ -254,8 +247,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert c.started?
     assert_equal io, c.instance_variable_get(:@debug_output)
 
-    assert_includes conns.keys, 'example.com:80'
-    assert_same c, conns['example.com:80']
+    assert_includes conns[0].keys, 'example.com:80'
+    assert_same c, conns[0]['example.com:80']
   end
 
   def test_connection_for_finished_ssl
@@ -278,7 +271,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     cached = basic_connection
     def cached.start; raise Errno::EHOSTDOWN end
     def cached.started?; false end
-    conns['example.com:80'] = cached
+    conns[0]['example.com:80'] = cached
 
     e = assert_raises Net::HTTP::Persistent::Error do
       @http.connection_for @uri
@@ -339,16 +332,16 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert c.started?
     assert c.proxy?
 
-    assert_includes conns.keys,
+    assert_includes conns[1].keys,
                     'example.com:80:proxy.example:80:johndoe:muffins'
-    assert_same c, conns['example.com:80:proxy.example:80:johndoe:muffins']
+    assert_same c, conns[1]['example.com:80:proxy.example:80:johndoe:muffins']
   end
 
   def test_connection_for_refused
     cached = basic_connection
     def cached.start; raise Errno::ECONNREFUSED end
     def cached.started?; false end
-    conns['example.com:80'] = cached
+    conns[0]['example.com:80'] = cached
 
     e = assert_raises Net::HTTP::Persistent::Error do
       @http.connection_for @uri
@@ -414,7 +407,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     cached.start
     reqs[cached.object_id] = 10
     touts[cached.object_id] = Time.now - 6
-    conns['example.com:80'] = cached
+    conns[0]['example.com:80'] = cached
 
     c = @http.connection_for @uri
 
@@ -493,6 +486,16 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 'https://example', @http.normalize_uri('https://example')
   end
 
+  def test_override_haeders
+    assert_empty @http.override_headers
+
+    @http.override_headers['User-Agent'] = 'MyCustomAgent'
+
+    expected = { 'User-Agent' => 'MyCustomAgent' }
+
+    assert_equal expected, @http.override_headers
+  end
+
   def test_pipeline
     skip 'net-http-pipeline not installed' unless defined?(Net::HTTP::Pipeline)
 
@@ -519,6 +522,25 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 1, @http.ssl_generation
   end
 
+  def test_proxy_equals_env
+    ENV['HTTP_PROXY'] = 'proxy.example'
+
+    @http.proxy = :ENV
+
+    assert_equal URI.parse('http://proxy.example'), @http.proxy_uri
+
+    assert_equal 1, @http.generation, 'generation'
+    assert_equal 1, @http.ssl_generation, 'ssl_generation'
+  end
+
+  def test_proxy_equals_uri
+    proxy_uri = URI.parse 'http://proxy.example'
+
+    @http.proxy = proxy_uri
+
+    assert_equal proxy_uri, @http.proxy_uri
+  end
+
   def test_proxy_from_env
     ENV['HTTP_PROXY']      = 'proxy.example'
     ENV['HTTP_PROXY_USER'] = 'johndoe'
@@ -559,6 +581,12 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_nil uri
   end
 
+  def test_reconnect
+    result = @http.reconnect
+
+    assert_equal 1, result
+  end
+
   def test_reconnect_ssl
     result = @http.reconnect_ssl
 
@@ -566,7 +594,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_request
-    @http.headers['user-agent'] = 'test ua'
+    @http.override_headers['user-agent'] = 'test ua'
+    @http.headers['accept'] = 'text/*'
     c = connection
 
     res = @http.request @uri
@@ -576,9 +605,12 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     assert_kind_of Net::HTTP::Get, req
     assert_equal '/path',      req.path
+
+    assert_equal 'test ua',    req['user-agent']
+    assert_match %r%text/\*%,  req['accept']
+
     assert_equal 'keep-alive', req['connection']
     assert_equal '30',         req['keep-alive']
-    assert_match %r%test ua%,  req['user-agent']
 
     assert_in_delta Time.now, touts[c.object_id]
 
@@ -928,18 +960,21 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     @http = orig
 
-    assert c.finished?
-    refute c2.finished?
+    assert c.finished?, 'last-generation connection must be finished'
+    refute c2.finished?, 'present generation connection must not be finished'
 
-    refute_same cs, conns
     refute_same rs, reqs
     refute_same ts, touts
 
+    assert_empty conns
+    assert_empty ssl_conns
+
     assert_empty reqs
     assert_empty touts
   end
 
   def test_shutdown_in_all_threads
+    conns
     ssl_conns
 
     t = Thread.new do
@@ -959,23 +994,31 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     assert_nil @http.shutdown_in_all_threads
 
-    assert c.finished?
-    assert_nil Thread.current[@http.connection_key]
+    assert c.finished?, 'connection in same thread must be finished'
+
+    assert_empty Thread.current[@http.generation_key]
+
     assert_nil Thread.current[@http.request_key]
 
     t.run
-    assert t.value.finished?
-    assert_nil t[@http.connection_key]
+    assert t.value.finished?, 'connection in other thread must be finished'
+
+    assert_empty t[@http.generation_key]
+
     assert_nil t[@http.request_key]
   end
 
   def test_shutdown_no_connections
+    conns
     ssl_conns
 
     @http.shutdown
 
-    assert_nil Thread.current[@http.connection_key]
+    assert_empty Thread.current[@http.generation_key]
+    assert_empty Thread.current[@http.ssl_generation_key]
+
     assert_nil Thread.current[@http.request_key]
+    assert_nil Thread.current[@http.timeout_key]
   end
 
   def test_shutdown_not_started
@@ -984,12 +1027,15 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     c = basic_connection
     def c.finish() raise IOError end
 
-    conns["#{@uri.host}:#{@uri.port}"] = c
+    conns[0]["#{@uri.host}:#{@uri.port}"] = c
 
     @http.shutdown
 
-    assert_nil Thread.current[@http.connection_key]
+    assert_empty Thread.current[@http.generation_key]
+    assert_empty Thread.current[@http.ssl_generation_key]
+
     assert_nil Thread.current[@http.request_key]
+    assert_nil Thread.current[@http.timeout_key]
   end
 
   def test_shutdown_ssl
@@ -1003,11 +1049,11 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_shutdown_thread
-    ssl_conns
-
     t = Thread.new do
       c = connection
       conns
+      ssl_conns
+
       reqs
 
       Thread.stop
@@ -1025,8 +1071,10 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     t.run
     assert t.value.finished?
-    assert_nil t[@http.connection_key]
+    assert_empty t[@http.generation_key]
+    assert_empty t[@http.ssl_generation_key]
     assert_nil t[@http.request_key]
+    assert_nil t[@http.timeout_key]
   end
 
   def test_ssl
@@ -1145,6 +1193,13 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_empty reqs # sanity check, performed by #finish
   end
 
+  def test_ssl_version_equals
+    @http.ssl_version = :ssl_version
+
+    assert_equal :ssl_version, @http.ssl_version
+    assert_equal 1, @http.ssl_generation
+  end if RUBY_VERSION > '1.9'
+
   def test_verify_callback_equals
     @http.verify_callback = :verify_callback
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 9
   prerelease: 
   segments: 
   - 2
-  - 4
-  - 1
-  version: 2.4.1
+  - 5
+  version: "2.5"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,7 +35,7 @@ cert_chain:
   YJY7T/W2n+eWy8WuPhzVUkyzguj0bQe27NDeabgCh2mHd4Hynk2AkYh8MQ==
   -----END CERTIFICATE-----
 
-date: 2012-02-04 00:00:00 Z
+date: 2012-02-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest