net-http-persistent 2.7 → 2.8

data/History.txt

@@ -1,3 +1,26 @@
+=== 2.8 / 2012-10-17
+
+* Minor enhancements
+  * Added Net::HTTP::Persistent::detect_idle_timeout which can be used to
+    determine the idle timeout for a host.
+  * The read timeout may now be updated for every request.  Issue #33 by
+    Mislav Marohnić
+  * Added NO_PROXY support.  Pull Request #31 by Laurence Rowe.
+  * Added #cert and #key aliases for Net::HTTP compatibility.  Pull request
+    #26 by dlee.
+  * The artifice gem now disables SSL session reuse to prevent breakage of
+    testing frameworks.  Pull Request #29 by Christopher Cooke.
+  * Disabled Net::HTTP::Persistent::SSLReuse on Ruby 2+.  This feature is now
+    built-in to Net::HTTP.
+* Bug fixes
+  * Socket options are set again following connection reset.  Pull request #28
+    by cmaion.
+  * #shutdown now works even if no connections were made.  Pull Request #24 by
+    James Tucker.
+  * Updated test RSA key size to 1024 bits.  Bug #25 by Gunnar Wolf.
+  * The correct host:port are shown in the exception when a proxy connection
+    fails.  Bug #30 by glebtv.
+
 === 2.7 / 2012-06-06
 
 * Minor enhancement

data/lib/net/http/persistent.rb

@@ -176,7 +176,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.7'
+  VERSION = '2.8'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -185,11 +185,61 @@ class Net::HTTP::Persistent
 
   class Error < StandardError; end
 
+  ##
+  # Use this method to detect the idle timeout of the host at +uri+.  The
+  # value returned can be used to configure #idle_timeout.  +max+ controls the
+  # maximum idle timeout to detect.
+  #
+  # After
+  #
+  # Idle timeout detection is performed by creating a connection then
+  # performing a HEAD request in a loop until the connection terminates
+  # waiting one additional second per loop.
+  #
+  # NOTE:  This may not work on ruby > 1.9.
+
+  def self.detect_idle_timeout uri, max = 10
+    uri = URI uri unless URI::Generic === uri
+    uri += '/'
+
+    req = Net::HTTP::Head.new uri.request_uri
+
+    http = new 'net-http-persistent detect_idle_timeout'
+
+    connection = http.connection_for uri
+
+    sleep_time = 0
+
+    loop do
+      response = connection.request req
+
+      $stderr.puts "HEAD #{uri} => #{response.code}" if $DEBUG
+
+      unless Net::HTTPOK === response then
+        raise Error, "bad response code #{response.code} detecting idle timeout"
+      end
+
+      break if sleep_time >= max
+
+      sleep_time += 1
+
+      $stderr.puts "sleeping #{sleep_time}" if $DEBUG
+      sleep sleep_time
+    end
+  ensure
+    http.shutdown
+
+    return sleep_time unless $!
+  end
+
   ##
   # This client's OpenSSL::X509::Certificate
 
   attr_reader :certificate
 
+  # For Net::HTTP parity
+  alias cert certificate
+
   ##
   # An SSL certificate authority.  Setting this will set verify_mode to
   # VERIFY_PEER.
@@ -269,11 +319,19 @@ class Net::HTTP::Persistent
 
   attr_reader :private_key
 
+  # For Net::HTTP parity
+  alias key private_key
+
   ##
   # The URL through which requests will be proxied
 
   attr_reader :proxy_uri
 
+  ##
+  # List of host suffixes which will not be proxied
+
+  attr_reader :no_proxy
+
   ##
   # Seconds to wait until reading one block.  See Net::HTTP#read_timeout
 
@@ -376,6 +434,7 @@ class Net::HTTP::Persistent
 
     @debug_output     = nil
     @proxy_uri        = nil
+    @no_proxy         = []
     @headers          = {}
     @override_headers = {}
     @http_versions    = {}
@@ -420,6 +479,9 @@ class Net::HTTP::Persistent
     reconnect_ssl
   end
 
+  # For Net::HTTP parity
+  alias cert= certificate=
+
   ##
   # Sets the SSL certificate authority file.
 
@@ -450,6 +512,8 @@ class Net::HTTP::Persistent
     timeouts = thread[@timeout_key]
 
     (0...generation).each do |old_generation|
+      next unless thread[generation_key]
+
       conns = thread[generation_key].delete old_generation
 
       conns.each_value do |conn|
@@ -488,7 +552,7 @@ class Net::HTTP::Persistent
     net_http_args = [uri.host, uri.port]
     connection_id = net_http_args.join ':'
 
-    if @proxy_uri then
+    if @proxy_uri and not proxy_bypass? uri.host, uri.port then
       connection_id << @proxy_connection_id
       net_http_args.concat @proxy_args
     end
@@ -503,27 +567,21 @@ class Net::HTTP::Persistent
       reset connection if expired? connection
     end
 
-    unless connection.started? then
-      connection.set_debug_output @debug_output if @debug_output
-      connection.open_timeout = @open_timeout if @open_timeout
-      connection.read_timeout = @read_timeout if @read_timeout
+    start connection unless connection.started?
 
-      connection.start
-
-      socket = connection.instance_variable_get :@socket
-
-      if socket then # for fakeweb
-        @socket_options.each do |option|
-          socket.io.setsockopt(*option)
-        end
-      end
-    end
+    connection.read_timeout = @read_timeout if @read_timeout
 
     connection
   rescue Errno::ECONNREFUSED
-    raise Error, "connection refused: #{connection.address}:#{connection.port}"
+    address = connection.proxy_address || connection.address
+    port    = connection.proxy_port    || connection.port
+
+    raise Error, "connection refused: #{address}:#{port}"
   rescue Errno::EHOSTDOWN
-    raise Error, "host down: #{connection.address}:#{connection.port}"
+    address = connection.proxy_address || connection.address
+    port    = connection.proxy_port    || connection.port
+
+    raise Error, "host down: #{address}:#{port}"
   end
 
   ##
@@ -560,6 +618,24 @@ class Net::HTTP::Persistent
     Time.now - last_used > @idle_timeout
   end
 
+  ##
+  # Starts the Net::HTTP +connection+
+
+  def start connection
+    connection.set_debug_output @debug_output if @debug_output
+    connection.open_timeout = @open_timeout if @open_timeout
+
+    connection.start
+
+    socket = connection.instance_variable_get :@socket
+
+    if socket then # for fakeweb
+      @socket_options.each do |option|
+        socket.io.setsockopt(*option)
+      end
+    end
+  end
+
   ##
   # Finishes the Net::HTTP +connection+
 
@@ -573,8 +649,11 @@ class Net::HTTP::Persistent
   end
 
   def http_class # :nodoc:
-    if [:FakeWeb, :WebMock].any? { |klass| Object.const_defined?(klass) } or
-      not @reuse_ssl_sessions then
+    if RUBY_VERSION > '2.0' then
+      Net::HTTP
+    elsif [:Artifice, :FakeWeb, :WebMock].any? { |klass|
+             Object.const_defined?(klass)
+          } or not @reuse_ssl_sessions then
         Net::HTTP
     else
       Net::HTTP::Persistent::SSLReuse
@@ -680,6 +759,9 @@ class Net::HTTP::Persistent
     reconnect_ssl
   end
 
+  # For Net::HTTP parity
+  alias key= private_key=
+
   ##
   # 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
@@ -689,8 +771,10 @@ class Net::HTTP::Persistent
   # 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.
+  # The +no_proxy+ query parameter can be used to specify hosts which shouldn't
+  # be reached via proxy; if set it should be a comma separated list of
+  # hostname suffixes, optionally with +:port+ appended, for example
+  # <tt>example.com,some.host:8080</tt>.
 
   def proxy= proxy
     @proxy_uri = case proxy
@@ -700,6 +784,8 @@ class Net::HTTP::Persistent
                  else raise ArgumentError, 'proxy must be :ENV or a URI::HTTP'
                  end
 
+    @no_proxy.clear
+
     if @proxy_uri then
       @proxy_args = [
         @proxy_uri.host,
@@ -709,6 +795,10 @@ class Net::HTTP::Persistent
       ]
 
       @proxy_connection_id = [nil, *@proxy_args].join ':'
+
+      if @proxy_uri.query then
+        @no_proxy = CGI.parse(@proxy_uri.query)['no_proxy'].join(',').downcase.split(',').map { |x| x.strip }.reject { |x| x.empty? }
+      end
     end
 
     reconnect
@@ -724,6 +814,12 @@ class Net::HTTP::Persistent
   # indicated user and password unless HTTP_PROXY contains either of these in
   # the URI.
   #
+  # The +NO_PROXY+ ENV variable can be used to specify hosts which shouldn't
+  # be reached via proxy; if set it should be a comma separated list of
+  # hostname suffixes, optionally with +:port+ appended, for example
+  # <tt>example.com,some.host:8080</tt>. When set to <tt>*</tt> no proxy will
+  # be returned.
+  #
   # For Windows users, lowercase ENV variables are preferred over uppercase ENV
   # variables.
 
@@ -734,6 +830,15 @@ class Net::HTTP::Persistent
 
     uri = URI normalize_uri env_proxy
 
+    env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
+
+    # '*' is special case for always bypass
+    return nil if env_no_proxy == '*' 
+
+    if env_no_proxy then
+      uri.query = "no_proxy=#{escape(env_no_proxy)}"
+    end 
+
     unless uri.user or uri.password then
       uri.user     = escape ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER']
       uri.password = escape ENV['http_proxy_pass'] || ENV['HTTP_PROXY_PASS']
@@ -742,6 +847,21 @@ class Net::HTTP::Persistent
     uri
   end
 
+  ##
+  # Returns true when proxy should by bypassed for host.
+
+  def proxy_bypass? host, port
+    host = host.downcase
+    host_port = [host, port].join ':'
+
+    @no_proxy.each do |name|
+      return true if host[-name.length, name.length] == name or
+         host_port[-name.length, name.length] == name
+    end
+
+    false
+  end
+
   ##
   # Forces reconnection of HTTP connections.
 
@@ -765,7 +885,7 @@ class Net::HTTP::Persistent
 
     finish connection
 
-    connection.start
+    start connection
   rescue Errno::ECONNREFUSED
     raise Error, "connection refused: #{connection.address}:#{connection.port}"
   rescue Errno::EHOSTDOWN

data/test/test_net_http_persistent.rb

@@ -4,8 +4,19 @@ require 'net/http/persistent'
 require 'openssl'
 require 'stringio'
 
-class Net::HTTP::Persistent::SSLReuse
-  alias orig_connect connect
+module Net::HTTP::Persistent::TestConnect
+  def self.included mod
+    mod.send :alias_method, :orig_connect, :connect
+
+    def mod.use_connect which
+      self.send :remove_method, :connect
+      self.send :alias_method, :connect, which
+    end
+  end
+
+  def host_down_connect
+    raise Errno::EHOSTDOWN
+  end
 
   def test_connect
     unless use_ssl? then
@@ -30,16 +41,30 @@ class Net::HTTP::Persistent::SSLReuse
     @socket = Net::BufferedIO.new s
   end
 
-  def self.use_connect which
-    self.send :remove_method, :connect
-    self.send :alias_method, :connect, which
+  def refused_connect
+    raise Errno::ECONNREFUSED
   end
 end
 
+class Net::HTTP
+  include Net::HTTP::Persistent::TestConnect
+end
+
+class Net::HTTP::Persistent::SSLReuse
+  include Net::HTTP::Persistent::TestConnect
+end
+
 class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
   def setup
+    @http_class = if RUBY_VERSION > '2.0' then
+                    Net::HTTP
+                  else
+                    Net::HTTP::Persistent::SSLReuse
+                  end
+
     @http = Net::HTTP::Persistent.new
+
     @uri  = URI.parse 'http://example.com/path'
 
     ENV.delete 'http_proxy'
@@ -48,7 +73,10 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     ENV.delete 'HTTP_PROXY_USER'
     ENV.delete 'http_proxy_pass'
     ENV.delete 'HTTP_PROXY_PASS'
+    ENV.delete 'no_proxy'
+    ENV.delete 'NO_PROXY'
 
+    Net::HTTP.use_connect :test_connect
     Net::HTTP::Persistent::SSLReuse.use_connect :test_connect
   end
 
@@ -57,12 +85,14 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
       Thread.current[key] = nil
     end
 
+    Net::HTTP.use_connect :orig_connect
     Net::HTTP::Persistent::SSLReuse.use_connect :orig_connect
   end
 
   class BasicConnection
-    attr_accessor :started, :finished, :address, :port
-    attr_reader :req
+    attr_accessor :started, :finished, :address, :port,
+                  :read_timeout, :open_timeout
+    attr_reader :req, :debug_output
     def initialize
       @started, @finished = 0, 0
       @address, @port = 'example.com', 80
@@ -80,6 +110,9 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     def reset?
       @started == @finished + 1
     end
+    def set_debug_output io
+      @debug_output = io
+    end
     def start
       @started += 1
       io = Object.new
@@ -142,6 +175,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   def test_initialize
     assert_nil @http.proxy_uri
 
+    assert_empty @http.no_proxy
+
     ssl_session_exists = OpenSSL::SSL.const_defined? :Session
 
     assert_equal ssl_session_exists, @http.reuse_ssl_sessions
@@ -201,7 +236,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     @http.read_timeout = 321
     c = @http.connection_for @uri
 
-    assert_kind_of Net::HTTP::Persistent::SSLReuse, c
+    assert_kind_of @http_class, c
 
     assert c.started?
     refute c.proxy?
@@ -211,15 +246,6 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     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
-                 [[Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1]]
-               else
-                 []
-               end
-
-    assert_equal expected, socket.io.instance_variable_get(:@setsockopts)
   end
 
   def test_connection_for_cached
@@ -227,10 +253,14 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     cached.start
     conns[0]['example.com:80'] = cached
 
+    @http.read_timeout = 5
+
     c = @http.connection_for @uri
 
     assert c.started?
 
+    assert_equal 5,       c.read_timeout
+
     assert_same cached, c
   end
 
@@ -324,6 +354,17 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
                  'connection not reset due to timeout'
   end
 
+  def test_connection_for_refused
+    Net::HTTP.use_connect :refused_connect
+    Net::HTTP::Persistent::SSLReuse.use_connect :refused_connect
+
+    e = assert_raises Net::HTTP::Persistent::Error do
+      @http.connection_for @uri
+    end
+
+    assert_equal 'connection refused: example.com:80', e.message
+  end
+
   def test_connection_for_finished_ssl
     uri = URI.parse 'https://example.com/path'
     c = @http.connection_for uri
@@ -350,7 +391,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
       @http.connection_for @uri
     end
 
-    assert_match %r%host down%, e.message
+    assert_equal 'host down: example.com:80', e.message
   end
 
   def test_connection_for_http_class_with_fakeweb
@@ -373,6 +414,16 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     end
   end
 
+  def test_connection_for_http_class_with_artifice
+    Object.send :const_set, :Artifice, nil
+    c = @http.connection_for @uri
+    assert_instance_of Net::HTTP, c
+  ensure
+    if Object.const_defined?(:Artifice) then
+      Object.send :remove_const, :Artifice
+    end
+  end
+
   def test_connection_for_name
     http = Net::HTTP::Persistent.new 'name'
     uri = URI.parse 'http://example/'
@@ -410,6 +461,57 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_same c, conns[1]['example.com:80:proxy.example:80:johndoe:muffins']
   end
 
+  def test_connection_for_proxy_host_down
+    Net::HTTP.use_connect :host_down_connect
+    Net::HTTP::Persistent::SSLReuse.use_connect :host_down_connect
+
+    uri = URI.parse 'http://proxy.example'
+    uri.user     = 'johndoe'
+    uri.password = 'muffins'
+
+    http = Net::HTTP::Persistent.new nil, uri
+
+    e = assert_raises Net::HTTP::Persistent::Error do
+      http.connection_for @uri
+    end
+
+    assert_equal 'host down: proxy.example:80', e.message
+  end
+
+  def test_connection_for_proxy_refused
+    Net::HTTP.use_connect :refused_connect
+    Net::HTTP::Persistent::SSLReuse.use_connect :refused_connect
+
+    uri = URI.parse 'http://proxy.example'
+    uri.user     = 'johndoe'
+    uri.password = 'muffins'
+
+    http = Net::HTTP::Persistent.new nil, uri
+
+    e = assert_raises Net::HTTP::Persistent::Error do
+      http.connection_for @uri
+    end
+
+    assert_equal 'connection refused: proxy.example:80', e.message
+  end
+
+  def test_connection_for_no_proxy
+    uri = URI.parse 'http://proxy.example'
+    uri.user     = 'johndoe'
+    uri.password = 'muffins'
+    uri.query    = 'no_proxy=example.com'
+
+    http = Net::HTTP::Persistent.new nil, uri
+
+    c = http.connection_for @uri
+
+    assert c.started?
+    refute c.proxy?
+
+    assert_includes conns[1].keys, 'example.com:80'
+    assert_same c, conns[1]['example.com:80']
+  end
+
   def test_connection_for_refused
     cached = basic_connection
     def cached.start; raise Errno::ECONNREFUSED end
@@ -423,20 +525,6 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_match %r%connection refused%, e.message
   end
 
-  def test_connection_for_socket_options
-    @http.socket_options << [Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1]
-    c = @http.connection_for @uri
-
-    socket = c.instance_variable_get :@socket
-
-    expected = []
-    expected << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
-      Socket.const_defined? :TCP_NODELAY
-    expected << [Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1]
-
-    assert_equal expected, socket.io.instance_variable_get(:@setsockopts)
-  end
-
   def test_connection_for_ssl
     uri = URI.parse 'https://example.com/path'
     c = @http.connection_for uri
@@ -642,12 +730,14 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     ENV['HTTP_PROXY']      = 'proxy.example'
     ENV['HTTP_PROXY_USER'] = 'johndoe'
     ENV['HTTP_PROXY_PASS'] = 'muffins'
+    ENV['NO_PROXY']        = 'localhost,example.com'
 
     uri = @http.proxy_from_env
 
     expected = URI.parse 'http://proxy.example'
     expected.user     = 'johndoe'
     expected.password = 'muffins'
+    expected.query    = 'no_proxy=localhost%2Cexample.com'
 
     assert_equal expected, uri
   end
@@ -656,12 +746,14 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     ENV['http_proxy']      = 'proxy.example'
     ENV['http_proxy_user'] = 'johndoe'
     ENV['http_proxy_pass'] = 'muffins'
+    ENV['no_proxy']        = 'localhost,example.com'
 
     uri = @http.proxy_from_env
 
     expected = URI.parse 'http://proxy.example'
     expected.user     = 'johndoe'
     expected.password = 'muffins'
+    expected.query    = 'no_proxy=localhost%2Cexample.com'
 
     assert_equal expected, uri
   end
@@ -678,6 +770,66 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_nil uri
   end
 
+  def test_proxy_from_env_no_proxy_star
+    uri = @http.proxy_from_env
+
+    assert_nil uri
+
+    ENV['HTTP_PROXY'] = 'proxy.example'
+    ENV['NO_PROXY'] = '*'
+
+    uri = @http.proxy_from_env
+
+    assert_nil uri
+  end
+
+  def test_proxy_bypass
+    ENV['HTTP_PROXY'] = 'proxy.example'
+    ENV['NO_PROXY'] = 'localhost,example.com:80'
+
+    @http.proxy = :ENV
+
+    assert @http.proxy_bypass? 'localhost', 80
+    assert @http.proxy_bypass? 'localhost', 443
+    assert @http.proxy_bypass? 'LOCALHOST', 80
+    assert @http.proxy_bypass? 'example.com', 80
+    refute @http.proxy_bypass? 'example.com', 443
+    assert @http.proxy_bypass? 'www.example.com', 80
+    refute @http.proxy_bypass? 'www.example.com', 443
+    assert @http.proxy_bypass? 'endingexample.com', 80
+    refute @http.proxy_bypass? 'example.org', 80
+  end
+
+  def test_proxy_bypass_space
+    ENV['HTTP_PROXY'] = 'proxy.example'
+    ENV['NO_PROXY'] = 'localhost, example.com'
+
+    @http.proxy = :ENV
+
+    assert @http.proxy_bypass? 'example.com', 80
+    refute @http.proxy_bypass? 'example.org', 80
+  end
+
+  def test_proxy_bypass_trailing
+    ENV['HTTP_PROXY'] = 'proxy.example'
+    ENV['NO_PROXY'] = 'localhost,example.com,'
+
+    @http.proxy = :ENV
+
+    assert @http.proxy_bypass? 'example.com', 80
+    refute @http.proxy_bypass? 'example.org', 80
+  end
+
+  def test_proxy_bypass_double_comma
+    ENV['HTTP_PROXY'] = 'proxy.example'
+    ENV['NO_PROXY'] = 'localhost,,example.com'
+
+    @http.proxy = :ENV
+
+    assert @http.proxy_bypass? 'example.com', 80
+    refute @http.proxy_bypass? 'example.org', 80
+  end
+
   def test_reconnect
     result = @http.reconnect
 
@@ -1113,13 +1265,10 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_shutdown_no_connections
-    conns
-    ssl_conns
-
     @http.shutdown
 
-    assert_empty Thread.current[@http.generation_key]
-    assert_empty Thread.current[@http.ssl_generation_key]
+    assert_nil Thread.current[@http.generation_key]
+    assert_nil Thread.current[@http.ssl_generation_key]
 
     assert_nil Thread.current[@http.request_key]
     assert_nil Thread.current[@http.timeout_key]
@@ -1303,6 +1452,28 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 1, @http.ssl_generation
   end if RUBY_VERSION > '1.9'
 
+  def test_start
+    c = basic_connection
+
+    @http.socket_options << [Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1]
+    @http.debug_output = $stderr
+    @http.open_timeout = 6
+
+    @http.start c
+
+    assert_equal $stderr, c.debug_output
+    assert_equal 6,       c.open_timeout
+
+    socket = c.instance_variable_get :@socket
+
+    expected = []
+    expected << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
+      Socket.const_defined? :TCP_NODELAY
+    expected << [Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1]
+
+    assert_equal expected, socket.io.instance_variable_get(:@setsockopts)
+  end
+
   def test_verify_callback_equals
     @http.verify_callback = :verify_callback
 

data/test/test_net_http_persistent_ssl_reuse.rb

@@ -19,9 +19,9 @@ class TestNetHttpPersistentSSLReuse < MiniTest::Unit::TestCase
   end
 
   def setup
-    @name = OpenSSL::X509::Name.parse 'CN=localhost'
+    @name = OpenSSL::X509::Name.parse 'CN=localhost/DC=localdomain'
 
-    @key = OpenSSL::PKey::RSA.new 512
+    @key = OpenSSL::PKey::RSA.new 1024
 
     @cert = OpenSSL::X509::Certificate.new
     @cert.version = 2
@@ -30,6 +30,9 @@ class TestNetHttpPersistentSSLReuse < MiniTest::Unit::TestCase
     @cert.not_after = Time.now + 300
     @cert.public_key = @key.public_key
     @cert.subject = @name
+    @cert.issuer = @name
+
+    @cert.sign @key, OpenSSL::Digest::SHA1.new
 
     @host = 'localhost'
     @port = 10082
@@ -73,12 +76,14 @@ class TestNetHttpPersistentSSLReuse < MiniTest::Unit::TestCase
   end
 
   def test_ssl_connection_reuse
+    store = OpenSSL::X509::Store.new
+    store.add_cert @cert
+
     @http = Net::HTTP::Persistent::SSLReuse.new @host, @port
+    @http.cert_store = store
+    @http.ssl_version = :SSLv3 if @http.respond_to? :ssl_version=
     @http.use_ssl = true
     @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
-    @http.verify_callback = proc do |_, store_ctx|
-      store_ctx.current_cert.to_der == @cert.to_der
-    end
 
     @http.start
     @http.get '/'

metadata

@@ -1,110 +1,121 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: net-http-persistent
-version: !ruby/object:Gem::Version 
-  hash: 13
+version: !ruby/object:Gem::Version
+  version: '2.8'
   prerelease: 
-  segments: 
-  - 2
-  - 7
-  version: "2.7"
 platform: ruby
-authors: 
+authors:
 - Eric Hodel
 autorequire: 
 bindir: bin
-cert_chain: 
-- |
-  -----BEGIN CERTIFICATE-----
-  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
-  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
-  ZXQwHhcNMTIwMjI4MTc1NDI1WhcNMTMwMjI3MTc1NDI1WjBBMRAwDgYDVQQDDAdk
-  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
-  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
-  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
-  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
-  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
-  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
-  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
-  sCANiQ8BAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
-  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DAfBgNVHREEGDAWgRRkcmJyYWluQHNlZ21l
-  bnQ3Lm5ldDAfBgNVHRIEGDAWgRRkcmJyYWluQHNlZ21lbnQ3Lm5ldDANBgkqhkiG
-  9w0BAQUFAAOCAQEAPeWzFnrcvC6eVzdlhmjUub2s6qieBkongKRDHQz5MEeQv4LS
-  SARnoHY+uCAVL/1xGAhmpzqQ3fJGWK9eBacW/e8E5GF9xQcV3mE1bA0WNaiDlX5j
-  U2aI+ZGSblqvHUCxKBHR1s7UMHsbz1saOmgdRTyPx0juJs68ocbUTeYBLWu9V4KP
-  zdGAG2JXO2gONg3b4tYDvpBLbry+KOX27iAJulUaH9TiTOULL4ITJVFsK0mYVqmR
-  Q8Tno9S3e4XGGP1ZWfLrTWEJbavFfhGHut2iMRwfC7s/YILAHNATopaJdH9DNpd1
-  U81zGHMUBOvz/VGT6wJwYJ3emS2nfA2NOHFfgA==
-  -----END CERTIFICATE-----
-
-date: 2012-06-06 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+cert_chain:
+- !binary |-
+  LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURlRENDQW1DZ0F3SUJB
+  Z0lCQVRBTkJna3Foa2lHOXcwQkFRVUZBREJCTVJBd0RnWURWUVFEREFka2Nt
+  SnkKWVdsdU1SZ3dGZ1lLQ1pJbWlaUHlMR1FCR1JZSWMyVm5iV1Z1ZERjeEV6
+  QVJCZ29Ka2lhSmsvSXNaQUVaRmdOdQpaWFF3SGhjTk1USXdNakk0TVRjMU5E
+  STFXaGNOTVRNd01qSTNNVGMxTkRJMVdqQkJNUkF3RGdZRFZRUUREQWRrCmNt
+  SnlZV2x1TVJnd0ZnWUtDWkltaVpQeUxHUUJHUllJYzJWbmJXVnVkRGN4RXpB
+  UkJnb0praWFKay9Jc1pBRVoKRmdOdVpYUXdnZ0VpTUEwR0NTcUdTSWIzRFFF
+  QkFRVUFBNElCRHdBd2dnRUtBb0lCQVFDYmJnTHJHTEdJREU3NgpMVi9jdnhk
+  RXpDdVl1UzNvRzlQclNabnVEd2V5U1VmZHAvc28wY0RxK2o4YnF5Nk96WlN3
+  MDdnZGp3Rk1TZDZKClU1ZGRaQ1Z5d241bm5BUStVaTdqTVc1NENZdDUvSDZm
+  MlVTNlUwaFFPakpSNmNwZml5bWd4R2RmeVRpVmN2VG0KR2ovb2tXclFsME5q
+  WU9ZQnBEaSs5UFBtYUgyUm1MSnUwZEIvTnlsc0RuVzVqNnlOMUJFSThNZkpS
+  UitIUktaWQptVXRnekJ3RjFWNEtJWlE4RXVMNkkvbkhWdTA3aTZJa3JwQWd4
+  cFhVZmRKUUppMG9aQXFYdXJBVjN5VHhrRndkCmc2MllyclcyNm1EZStwWkJ6
+  UjZicExFK1BtWEN6ejdVeFVxM0FFMGdQSGJpTVhpZTNFRkUwb3huc1UzbElk
+  dWgKc0NBTmlROEJBZ01CQUFHamV6QjVNQWtHQTFVZEV3UUNNQUF3Q3dZRFZS
+  MFBCQVFEQWdTd01CMEdBMVVkRGdRVwpCQlM1azRaNzVWU3BkTTBBY2xHMlV2
+  ekZBL1ZXNURBZkJnTlZIUkVFR0RBV2dSUmtjbUp5WVdsdVFITmxaMjFsCmJu
+  UTNMbTVsZERBZkJnTlZIUklFR0RBV2dSUmtjbUp5WVdsdVFITmxaMjFsYm5R
+  M0xtNWxkREFOQmdrcWhraUcKOXcwQkFRVUZBQU9DQVFFQVBlV3pGbnJjdkM2
+  ZVZ6ZGxobWpVdWIyczZxaWVCa29uZ0tSREhRejVNRWVRdjRMUwpTQVJub0hZ
+  K3VDQVZMLzF4R0FobXB6cVEzZkpHV0s5ZUJhY1cvZThFNUdGOXhRY1YzbUUx
+  YkEwV05haURsWDVqClUyYUkrWkdTYmxxdkhVQ3hLQkhSMXM3VU1Ic2J6MXNh
+  T21nZFJUeVB4MGp1SnM2OG9jYlVUZVlCTFd1OVY0S1AKemRHQUcySlhPMmdP
+  TmczYjR0WUR2cEJMYnJ5K0tPWDI3aUFKdWxVYUg5VGlUT1VMTDRJVEpWRnNL
+  MG1ZVnFtUgpROFRubzlTM2U0WEdHUDFaV2ZMclRXRUpiYXZGZmhHSHV0MmlN
+  UndmQzdzL1lJTEFITkFUb3BhSmRIOUROcGQxClU4MXpHSE1VQk92ei9WR1Q2
+  d0p3WUozZW1TMm5mQTJOT0hGZmdBPT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUt
+  LS0tLQo=
+date: 2012-10-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: minitest
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 11
-        version: "2.11"
+      - !ruby/object:Gem::Version
+        version: '3.4'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 3
-        - 10
-        version: "3.10"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.10'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
+      - !ruby/object:Gem::Version
+        version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: hoe
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :development
-  version_requirements: *id003
-description: |-
-  Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8.
-  It's thread-safe too!
-  
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+description: ! 'Manages persistent connections using Net::HTTP plus a speed fix for
+  Ruby 1.8.
+
+  It''s thread-safe too!
+
+
   Using persistent HTTP connections can dramatically increase the speed of HTTP.
+
   Creating a new HTTP connection for every request involves an extra TCP
+
   round-trip and causes TCP congestion avoidance negotiation to start over.
-  
+
+
   Net::HTTP supports persistent connections with some API methods but does not
+
   handle reconnection gracefully.  Net::HTTP::Persistent supports reconnection
-  and retry according to RFC 2616.
-email: 
+
+  and retry according to RFC 2616.'
+email:
 - drbrain@segment7.net
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - README.rdoc
-files: 
+files:
 - .autotest
 - .gemtest
 - History.txt
@@ -118,38 +129,31 @@ files:
 - test/test_net_http_persistent_ssl_reuse.rb
 homepage: http://docs.seattlerb.org/net-http-persistent
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.rdoc
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: net-http-persistent
-rubygems_version: 1.8.21
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8
-test_files: 
+summary: Manages persistent connections using Net::HTTP plus a speed fix for Ruby
+  1.8
+test_files:
 - test/test_net_http_persistent.rb
 - test/test_net_http_persistent_ssl_reuse.rb