net-http-persistent 2.8 → 2.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ea7002c40a540ea921855f2b04c1862c0e501bb9
+  data.tar.gz: 2e542b3cbdc4752799409f8dd1ecbbbb1ee84f0a
+SHA512:
+  metadata.gz: 591fb46b7ac365d1268935f44a449cdd4cfc56c64398d3e258baf7cd5e215fd213e42f5f9fcc5fdc032daae2dc93a34404833dd3a9afc6dc0ed4828547709f11
+  data.tar.gz: 3865436c02a8efecc81c335bb603d1ca2b540a3dde995df17f7dc844e38d0715279a02d4cf77128bff9f837380530e3d3487e3a396e05a6e1fa4936b904ea7cf

data.tar.gz.sig

@@ -1 +1 @@
-4Dx�.�<
+��iB�����<WȌ���Kz�|t�*��{Ѳȇ��*M���T�M�BM�����VU�bMorv�#�D��m;7�%�7A��g���O��q.S+�����W��"/���Q�a��\�TK��Lя�V��Q��wcy��L[�S���Ӽ'��]��Ap��KS}��/	��,�Lz��I�R�}��y1�v$?$^*CH��B�h�Ú��E�O�qǥۉ6C�|g"�NJA��g��G(

data/.autotest

@@ -3,5 +3,7 @@
 require 'autotest/restart'
 
 Autotest.add_hook :initialize do |at|
-  at.testlib = 'minitest/unit'
+  at.add_exception '.git'
+  at.add_exception '.rdoc'
 end
+

data/History.txt

@@ -1,3 +1,25 @@
+=== 2.9 / 2013-07-24
+
+* Minor enhancement
+  * Added max_requests to avoid ECONNRESET for a server that allows a limited
+    number of requests on a connection.  Pull request #42 by James Tucker.
+  * Request failures are now raised with the backtrace of the original
+    exception.  This gives better insight into the reason for the failure.
+    See #41 by Andrew Cholakian.
+  * OpenSSL is no longer required.  If OpenSSL is not available an exception
+    will be raised when attempting to access HTTPS resources.  Feature request
+    by André Arko
+
+* Bug fixes
+  * Explain the proper way of sending parameters depending upon the request
+    method.  Issue #35 by André Arko.
+  * Handle Errno::ETIMEDOUT by retrying the request.  Issue #36 by André Arko.
+  * Requests retried by ruby 2.x are no longer retried by net-http-persistent.
+  * Finish the connection if an otherwise unhandled exception happens during a
+    request.  Bug #46 by Mark Oude Veldhuis.
+  * detect_idle_timeout now assumes a StandardError indicates the idle timeout
+    has been found.  Bug #43 by James Tucker.
+
 === 2.8 / 2012-10-17
 
 * Minor enhancements

data/lib/net/http/persistent.rb

@@ -1,5 +1,9 @@
 require 'net/http'
-require 'net/https'
+begin
+  require 'net/https'
+rescue LoadError
+  # net/https or openssl
+end if RUBY_VERSION < '1.9' # but only for 1.8
 require 'net/http/faster'
 require 'uri'
 require 'cgi' # for escaping
@@ -9,6 +13,8 @@ begin
 rescue LoadError
 end
 
+autoload :OpenSSL, 'openssl'
+
 ##
 # Persistent connections for Net::HTTP
 #
@@ -37,6 +43,11 @@ end
 #   # perform a GET
 #   response = http.request uri
 #
+#   # or
+#
+#   get = Net::HTTP::Get.new uri.request_uri
+#   response = http.request get
+#
 #   # create a POST
 #   post_uri = uri + 'create'
 #   post = Net::HTTP::Post.new post_uri.path
@@ -45,6 +56,10 @@ end
 #   # perform the POST, the URI is always required
 #   response http.request post_uri, post
 #
+# Note that for GET, HEAD and other requests that do not have a body you want
+# to use URI#request_uri not URI#path.  The request_uri contains the query
+# params which are sent in the body for other requests.
+#
 # == SSL
 #
 # SSL connections are automatically created depending upon the scheme of the
@@ -105,6 +120,13 @@ end
 # The amount of time allowed between reading two chunks from the socket.  Set
 # through #read_timeout
 #
+# === Max Requests
+#
+# The number of requests that should be made before opening a new connection.
+# Typically many keep-alive capable servers tune this to 100 or less, so the
+# 101st request will fail with ECONNRESET. If unset (default), this value has no
+# effect, if set, connections will be reset on the request after max_requests.
+#
 # === Open Timeout
 #
 # The amount of time to wait for a connection to be opened.  Set through
@@ -173,10 +195,30 @@ class Net::HTTP::Persistent
 
   EPOCH = Time.at 0 # :nodoc:
 
+  ##
+  # Is OpenSSL available?  This test works with autoload
+
+  HAVE_OPENSSL = defined? OpenSSL::SSL # :nodoc:
+
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.8'
+  VERSION = '2.9'
+
+  ##
+  # Exceptions rescued for automatic retry on ruby 2.0.0.  This overlaps with
+  # the exception list for ruby 1.x.
+
+  RETRIED_EXCEPTIONS = [ # :nodoc:
+    (Net::ReadTimeout if Net.const_defined? :ReadTimeout),
+    IOError,
+    EOFError,
+    Errno::ECONNRESET,
+    Errno::ECONNABORTED,
+    Errno::EPIPE,
+    (OpenSSL::SSL::SSLError if HAVE_OPENSSL),
+    Timeout::Error,
+  ].compact
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -226,6 +268,8 @@ class Net::HTTP::Persistent
       $stderr.puts "sleeping #{sleep_time}" if $DEBUG
       sleep sleep_time
     end
+  rescue
+    # ignore StandardErrors, we've probably found the idle timeout.
   ensure
     http.shutdown
 
@@ -287,6 +331,12 @@ class Net::HTTP::Persistent
 
   attr_accessor :idle_timeout
 
+  ##
+  # Maximum number of requests on a connection before it is considered expired
+  # and automatically closed.
+
+  attr_accessor :max_requests
+
   ##
   # The value sent in the Keep-Alive header.  Defaults to 30.  Not needed for
   # HTTP/1.1 servers.
@@ -442,6 +492,7 @@ class Net::HTTP::Persistent
     @open_timeout     = nil
     @read_timeout     = nil
     @idle_timeout     = 5
+    @max_requests     = nil
     @socket_options   = []
 
     @socket_options << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
@@ -458,15 +509,22 @@ class Net::HTTP::Persistent
     @private_key        = nil
     @ssl_version        = nil
     @verify_callback    = nil
-    @verify_mode        = OpenSSL::SSL::VERIFY_PEER
+    @verify_mode        = nil
     @cert_store         = nil
 
     @generation         = 0 # incremented when proxy URI changes
     @ssl_generation     = 0 # incremented when SSL session variables change
-    @reuse_ssl_sessions = OpenSSL::SSL.const_defined? :Session
+
+    if HAVE_OPENSSL then
+      @verify_mode        = OpenSSL::SSL::VERIFY_PEER
+      @reuse_ssl_sessions = OpenSSL::SSL.const_defined? :Session
+    end
 
     @retry_change_requests = false
 
+    @ruby_1 = RUBY_VERSION < '2'
+    @retried_on_ruby_2 = !@ruby_1
+
     self.proxy = proxy if proxy
   end
 
@@ -536,6 +594,9 @@ class Net::HTTP::Persistent
     use_ssl = uri.scheme.downcase == 'https'
 
     if use_ssl then
+      raise Net::HTTP::Persistent::Error, 'OpenSSL is not available' unless
+        HAVE_OPENSSL
+
       ssl_generation = @ssl_generation
 
       ssl_cleanup ssl_generation
@@ -606,10 +667,12 @@ class Net::HTTP::Persistent
   end
 
   ##
-  # Returns true if the connection should be reset due to an idle timeout,
-  # false otherwise.
+  # Returns true if the connection should be reset due to an idle timeout, or
+  # maximum request count, false otherwise.
 
   def expired? connection
+    requests = Thread.current[@request_key][connection.object_id]
+    return true  if     @max_requests && requests >= @max_requests
     return false unless @idle_timeout
     return true  if     @idle_timeout.zero?
 
@@ -679,10 +742,15 @@ class Net::HTTP::Persistent
   end
 
   ##
-  # Is the request idempotent or is retry_change_requests allowed
+  # Is the request +req+ idempotent or is retry_change_requests allowed.
+  #
+  # If +retried_on_ruby_2+ is true, true will be returned if we are on ruby,
+  # retry_change_requests is allowed and the request is not idempotent.
 
-  def can_retry? req
-    retry_change_requests or idempotent?(req)
+  def can_retry? req, retried_on_ruby_2 = false
+    return @retry_change_requests && !idempotent?(req) if retried_on_ruby_2
+
+    @retry_change_requests || idempotent?(req)
   end
 
   if RUBY_VERSION > '1.9' then
@@ -833,11 +901,11 @@ class Net::HTTP::Persistent
     env_no_proxy = ENV['no_proxy'] || ENV['NO_PROXY']
 
     # '*' is special case for always bypass
-    return nil if env_no_proxy == '*' 
+    return nil if env_no_proxy == '*'
 
     if env_no_proxy then
       uri.query = "no_proxy=#{escape(env_no_proxy)}"
-    end 
+    end
 
     unless uri.user or uri.password then
       uri.user     = escape ENV['http_proxy_user'] || ENV['HTTP_PROXY_USER']
@@ -901,27 +969,14 @@ class Net::HTTP::Persistent
   #
   # +req+ must be a Net::HTTPRequest subclass (see Net::HTTP for a list).
   #
-  # If there is an error and the request is idempontent according to RFC 2616
+  # If there is an error and the request is idempotent according to RFC 2616
   # it will be retried automatically.
 
   def request uri, req = nil, &block
     retried      = false
     bad_response = false
 
-    req = Net::HTTP::Get.new uri.request_uri unless req
-
-    @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
-    end
+    req = request_setup req || uri
 
     connection = connection_for uri
     connection_id = connection.object_id
@@ -946,23 +1001,25 @@ class Net::HTTP::Persistent
 
       bad_response = true
       retry
-    rescue IOError, EOFError, Timeout::Error,
-           Errno::ECONNABORTED, Errno::ECONNRESET, Errno::EPIPE,
-           Errno::EINVAL, OpenSSL::SSL::SSLError => e
+    rescue *RETRIED_EXCEPTIONS => e # retried on ruby 2
+      request_failed e, req, connection if
+        retried or not can_retry? req, @retried_on_ruby_2
 
-      if retried or not can_retry? req
-        due_to = "(due to #{e.message} - #{e.class})"
-        message = error_message connection
-
-        finish connection
+      reset connection
 
-        raise Error, "too many connection resets #{due_to} #{message}"
-      end
+      retried = true
+      retry
+    rescue Errno::EINVAL, Errno::ETIMEDOUT => e # not retried on ruby 2
+      request_failed e, req, connection if retried or not can_retry? req
 
       reset connection
 
       retried = true
       retry
+    rescue Exception => e
+      finish connection
+
+      raise
     ensure
       Thread.current[@timeout_key][connection_id] = Time.now
     end
@@ -972,6 +1029,51 @@ class Net::HTTP::Persistent
     response
   end
 
+  ##
+  # Raises an Error for +exception+ which resulted from attempting the request
+  # +req+ on the +connection+.
+  #
+  # Finishes the +connection+.
+
+  def request_failed exception, req, connection # :nodoc:
+    due_to = "(due to #{exception.message} - #{exception.class})"
+    message = "too many connection resets #{due_to} #{error_message connection}"
+
+    finish connection
+
+
+    raise Error, message, exception.backtrace
+  end
+
+  ##
+  # Creates a GET request if +req_or_uri+ is a URI and adds headers to the
+  # request.
+  #
+  # Returns the request.
+
+  def request_setup req_or_uri # :nodoc:
+    req = if URI === req_or_uri then
+            Net::HTTP::Get.new req_or_uri.request_uri
+          else
+            req_or_uri
+          end
+
+    @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
+    end
+
+    req
+  end
+
   ##
   # Shuts down all connections for +thread+.
   #

data/test/test_net_http_persistent.rb

@@ -1,9 +1,10 @@
 require 'rubygems'
 require 'minitest/autorun'
 require 'net/http/persistent'
-require 'openssl'
 require 'stringio'
 
+HAVE_OPENSSL = defined?(OpenSSL::SSL)
+
 module Net::HTTP::Persistent::TestConnect
   def self.included mod
     mod.send :alias_method, :orig_connect, :connect
@@ -54,13 +55,15 @@ class Net::HTTP::Persistent::SSLReuse
   include Net::HTTP::Persistent::TestConnect
 end
 
-class TestNetHttpPersistent < MiniTest::Unit::TestCase
+class TestNetHttpPersistent < Minitest::Test
+
+  RUBY_1 = RUBY_VERSION < '2'
 
   def setup
-    @http_class = if RUBY_VERSION > '2.0' then
-                    Net::HTTP
-                  else
+    @http_class = if RUBY_1 and HAVE_OPENSSL then
                     Net::HTTP::Persistent::SSLReuse
+                  else
+                    Net::HTTP
                   end
 
     @http = Net::HTTP::Persistent.new
@@ -177,6 +180,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     assert_empty @http.no_proxy
 
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     ssl_session_exists = OpenSSL::SSL.const_defined? :Session
 
     assert_equal ssl_session_exists, @http.reuse_ssl_sessions
@@ -188,6 +193,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_initialize_no_ssl_session
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     skip "OpenSSL::SSL::Session does not exist on #{RUBY_PLATFORM}" unless
       OpenSSL::SSL.const_defined? :Session
 
@@ -217,6 +224,39 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 1, @http.ssl_generation
   end
 
+  def test_can_retry_eh_change_requests
+    post = Net::HTTP::Post.new '/'
+
+    refute @http.can_retry? post
+
+    @http.retry_change_requests = true
+
+    assert @http.can_retry? post
+  end
+
+  if RUBY_1 then
+    def test_can_retry_eh_idempotent
+      head = Net::HTTP::Head.new '/'
+
+      assert @http.can_retry? head
+
+      post = Net::HTTP::Post.new '/'
+
+      refute @http.can_retry? post
+    end
+  else
+    def test_can_retry_eh_idempotent
+      head = Net::HTTP::Head.new '/'
+
+      assert @http.can_retry? head
+      refute @http.can_retry? head, true
+
+      post = Net::HTTP::Post.new '/'
+
+      refute @http.can_retry? post
+    end
+  end
+
   def test_cert_store_equals
     @http.cert_store = :cert_store
 
@@ -366,6 +406,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_finished_ssl
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     uri = URI.parse 'https://example.com/path'
     c = @http.connection_for uri
 
@@ -526,6 +568,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_ssl
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     uri = URI.parse 'https://example.com/path'
     c = @http.connection_for uri
 
@@ -534,6 +578,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_ssl_cached
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @uri = URI.parse 'https://example.com/path'
 
     cached = ssl_connection 0
@@ -544,6 +590,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_ssl_cached_reconnect
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @uri = URI.parse 'https://example.com/path'
 
     cached = ssl_connection
@@ -556,6 +604,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_connection_for_ssl_case
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     uri = URI.parse 'HTTPS://example.com/path'
     c = @http.connection_for uri
 
@@ -596,6 +646,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
   def test_expired_eh
     c = basic_connection
+    reqs[c.object_id] = 0
     touts[c.object_id] = Time.now - 11
 
     @http.idle_timeout = 0
@@ -614,6 +665,23 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     refute @http.expired? c
   end
 
+  def test_expired_due_to_max_requests
+    c = basic_connection
+    reqs[c.object_id] = 0
+    touts[c.object_id] = Time.now
+
+    refute @http.expired? c
+
+    reqs[c.object_id] = 10
+    refute @http.expired? c
+
+    @http.max_requests = 10
+    assert @http.expired? c
+
+    reqs[c.object_id] = 9
+    refute @http.expired? c
+  end
+
   def test_finish
     c = basic_connection
     reqs[c.object_id] = 5
@@ -708,7 +776,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_proxy_equals_env
-    ENV['HTTP_PROXY'] = 'proxy.example'
+    ENV['http_proxy'] = 'proxy.example'
 
     @http.proxy = :ENV
 
@@ -727,9 +795,9 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_proxy_from_env
-    ENV['HTTP_PROXY']      = 'proxy.example'
-    ENV['HTTP_PROXY_USER'] = 'johndoe'
-    ENV['HTTP_PROXY_PASS'] = 'muffins'
+    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
@@ -763,7 +831,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     assert_nil uri
 
-    ENV['HTTP_PROXY'] = ''
+    ENV['http_proxy'] = ''
 
     uri = @http.proxy_from_env
 
@@ -775,8 +843,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     assert_nil uri
 
-    ENV['HTTP_PROXY'] = 'proxy.example'
-    ENV['NO_PROXY'] = '*'
+    ENV['http_proxy'] = 'proxy.example'
+    ENV['no_proxy'] = '*'
 
     uri = @http.proxy_from_env
 
@@ -784,8 +852,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_proxy_bypass
-    ENV['HTTP_PROXY'] = 'proxy.example'
-    ENV['NO_PROXY'] = 'localhost,example.com:80'
+    ENV['http_proxy'] = 'proxy.example'
+    ENV['no_proxy'] = 'localhost,example.com:80'
 
     @http.proxy = :ENV
 
@@ -801,8 +869,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_proxy_bypass_space
-    ENV['HTTP_PROXY'] = 'proxy.example'
-    ENV['NO_PROXY'] = 'localhost, example.com'
+    ENV['http_proxy'] = 'proxy.example'
+    ENV['no_proxy'] = 'localhost, example.com'
 
     @http.proxy = :ENV
 
@@ -811,8 +879,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_proxy_bypass_trailing
-    ENV['HTTP_PROXY'] = 'proxy.example'
-    ENV['NO_PROXY'] = 'localhost,example.com,'
+    ENV['http_proxy'] = 'proxy.example'
+    ENV['no_proxy'] = 'localhost,example.com,'
 
     @http.proxy = :ENV
 
@@ -821,8 +889,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_proxy_bypass_double_comma
-    ENV['HTTP_PROXY'] = 'proxy.example'
-    ENV['NO_PROXY'] = 'localhost,,example.com'
+    ENV['http_proxy'] = 'proxy.example'
+    ENV['no_proxy'] = 'localhost,,example.com'
 
     @http.proxy = :ENV
 
@@ -866,6 +934,18 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 1, reqs[c.object_id]
   end
 
+  def test_request_ETIMEDOUT
+    c = basic_connection
+    def c.request(*a) raise Errno::ETIMEDOUT, "timed out" end
+
+    e = assert_raises Net::HTTP::Persistent::Error do
+      @http.request @uri
+    end
+
+    assert_equal 0, reqs[c.object_id]
+    assert_match %r%too many connection resets%, e.message
+  end
+
   def test_request_bad_response
     c = basic_connection
     def c.request(*a) raise Net::HTTPBadResponse end
@@ -878,23 +958,38 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_match %r%too many bad responses%, e.message
   end
 
-  def test_request_bad_response_retry
-    c = basic_connection
-    def c.request(*a)
-      if defined? @called then
-        r = Net::HTTPResponse.allocate
-        r.instance_variable_set :@header, {}
-        def r.http_version() '1.1' end
-        r
-      else
-        @called = true
-        raise Net::HTTPBadResponse
+  if RUBY_1 then
+    def test_request_bad_response_retry
+      c = basic_connection
+      def c.request(*a)
+        if defined? @called then
+          r = Net::HTTPResponse.allocate
+          r.instance_variable_set :@header, {}
+          def r.http_version() '1.1' end
+          r
+        else
+          @called = true
+          raise Net::HTTPBadResponse
+        end
       end
+
+      @http.request @uri
+
+      assert c.finished?
     end
+  else
+    def test_request_bad_response_retry
+      c = basic_connection
+      def c.request(*a)
+        raise Net::HTTPBadResponse
+      end
 
-    @http.request @uri
+      assert_raises Net::HTTP::Persistent::Error do
+        @http.request @uri
+      end
 
-    assert c.finished?
+      assert c.finished?
+    end
   end
 
   def test_request_bad_response_unsafe
@@ -1023,6 +1118,18 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert c.finished?
   end
 
+  def test_request_exception
+    c = basic_connection
+    def c.request(*a) raise Exception, "very bad things happened" end
+
+    assert_raises Exception do
+      @http.request @uri
+    end
+
+    assert_equal 0, reqs[c.object_id]
+    assert c.finished?
+  end
+
   def test_request_invalid
     c = basic_connection
     def c.request(*a) raise Errno::EINVAL, "write" end
@@ -1080,25 +1187,43 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_match %r%too many connection resets%, e.message
   end
 
-  def test_request_reset_retry
-    c = basic_connection
-    touts[c.object_id] = Time.now
-    def c.request(*a)
-      if defined? @called then
-        r = Net::HTTPResponse.allocate
-        r.instance_variable_set :@header, {}
-        def r.http_version() '1.1' end
-        r
-      else
-        @called = true
-        raise Errno::ECONNRESET
+  if RUBY_1 then
+    def test_request_reset_retry
+      c = basic_connection
+      touts[c.object_id] = Time.now
+      def c.request(*a)
+        if defined? @called then
+          r = Net::HTTPResponse.allocate
+          r.instance_variable_set :@header, {}
+          def r.http_version() '1.1' end
+          r
+        else
+          @called = true
+          raise Errno::ECONNRESET
+        end
       end
+
+      @http.request @uri
+
+      assert c.reset?
+      assert c.finished?
     end
+  else
+    def test_request_reset_retry
+      c = basic_connection
+      touts[c.object_id] = Time.now
 
-    @http.request @uri
+      def c.request(*a)
+        raise Errno::ECONNRESET
+      end
 
-    assert c.reset?
-    assert c.finished?
+      assert_raises Net::HTTP::Persistent::Error do
+        @http.request @uri
+      end
+
+      refute c.reset?
+      assert c.finished?
+    end
   end
 
   def test_request_reset_unsafe
@@ -1121,6 +1246,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_request_ssl_error
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     uri = URI.parse 'https://example.com/path'
     c = @http.connection_for uri
     def c.request(*)
@@ -1133,6 +1260,57 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_match %r%bad write retry%, e.message
   end
 
+  def test_request_setup
+    @http.override_headers['user-agent'] = 'test ua'
+    @http.headers['accept'] = 'text/*'
+
+    input = Net::HTTP::Post.new '/path'
+
+    req = @http.request_setup input
+
+    assert_same input,         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']
+  end
+
+  def test_request_setup_uri
+    uri = @uri + '?a=b'
+
+    req = @http.request_setup uri
+
+    assert_kind_of Net::HTTP::Get, req
+    assert_equal '/path?a=b',  req.path
+  end
+
+  def test_request_failed
+    c = basic_connection
+    reqs[c.object_id] = 1
+    touts[c.object_id] = Time.now
+
+    original = nil
+
+    begin
+      raise 'original'
+    rescue => original
+    end
+
+    req = Net::HTTP::Get.new '/'
+      
+    e = assert_raises Net::HTTP::Persistent::Error do
+      @http.request_failed original, req, c
+    end
+
+    assert_match "too many connection resets (due to original - RuntimeError)",
+                 e.message
+
+    assert_equal original.backtrace, e.backtrace
+  end
+
   def test_reset
     c = basic_connection
     c.start
@@ -1191,14 +1369,25 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     refute @http.retry_change_requests
 
-    assert @http.can_retry?(get)
+    if RUBY_1 then
+      assert @http.can_retry?(get)
+    else
+      assert @http.can_retry?(get)
+    end
+    refute @http.can_retry?(get, true)
     refute @http.can_retry?(post)
 
     @http.retry_change_requests = true
 
     assert @http.retry_change_requests
 
-    assert @http.can_retry?(get)
+    if RUBY_1 then
+      assert @http.can_retry?(get)
+    else
+      assert @http.can_retry?(get)
+      refute @http.can_retry?(get, true)
+    end
+
     assert @http.can_retry?(post)
   end
 
@@ -1292,6 +1481,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_shutdown_ssl
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @uri = URI 'https://example'
 
     @http.connection_for @uri
@@ -1331,6 +1522,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_ssl
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @http.verify_callback = :callback
     c = Net::HTTP.new 'localhost', 80
 
@@ -1343,6 +1536,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_ssl_ca_file
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @http.ca_file = 'ca_file'
     @http.verify_callback = :callback
     c = Net::HTTP.new 'localhost', 80
@@ -1355,6 +1550,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_ssl_cert_store
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     store = OpenSSL::X509::Store.new
     @http.cert_store = store
 
@@ -1367,6 +1564,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_ssl_cert_store_default
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @http.verify_mode = OpenSSL::SSL::VERIFY_PEER
 
     c = Net::HTTP.new 'localhost', 80
@@ -1378,6 +1577,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_ssl_certificate
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @http.certificate = :cert
     @http.private_key = :key
     c = Net::HTTP.new 'localhost', 80
@@ -1390,6 +1591,8 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_ssl_verify_mode
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     @http.verify_mode = OpenSSL::SSL::VERIFY_NONE
     c = Net::HTTP.new 'localhost', 80
 
@@ -1400,35 +1603,41 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
   end
 
   def test_ssl_warning
-    orig_verify_peer = OpenSSL::SSL::VERIFY_PEER
-    OpenSSL::SSL.send :remove_const, :VERIFY_PEER
-    OpenSSL::SSL.send :const_set, :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
 
-    c = Net::HTTP.new 'localhost', 80
+    begin
+      orig_verify_peer = OpenSSL::SSL::VERIFY_PEER
+      OpenSSL::SSL.send :remove_const, :VERIFY_PEER
+      OpenSSL::SSL.send :const_set, :VERIFY_PEER, OpenSSL::SSL::VERIFY_NONE
 
-    out, err = capture_io do
-      @http.ssl c
-    end
+      c = Net::HTTP.new 'localhost', 80
 
-    assert_empty out
+      out, err = capture_io do
+        @http.ssl c
+      end
 
-    assert_match %r%localhost:80%, err
-    assert_match %r%I_KNOW_THAT_OPENSSL%, err
+      assert_empty out
 
-    Object.send :const_set, :I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG, nil
+      assert_match %r%localhost:80%, err
+      assert_match %r%I_KNOW_THAT_OPENSSL%, err
 
-    assert_silent do
-      @http.ssl c
-    end
-  ensure
-    OpenSSL::SSL.send :remove_const, :VERIFY_PEER
-    OpenSSL::SSL.send :const_set, :VERIFY_PEER, orig_verify_peer
-    if Object.const_defined?(:I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG) then
-      Object.send :remove_const, :I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG
+      Object.send :const_set, :I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG, nil
+
+      assert_silent do
+        @http.ssl c
+      end
+    ensure
+      OpenSSL::SSL.send :remove_const, :VERIFY_PEER
+      OpenSSL::SSL.send :const_set, :VERIFY_PEER, orig_verify_peer
+      if Object.const_defined?(:I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG) then
+        Object.send :remove_const, :I_KNOW_THAT_OPENSSL_VERIFY_PEER_EQUALS_VERIFY_NONE_IS_WRONG
+      end
     end
   end
 
   def test_ssl_cleanup
+    skip 'OpenSSL is missing' unless HAVE_OPENSSL
+
     uri1 = URI.parse 'https://one.example'
 
     c1 = @http.connection_for uri1
@@ -1450,7 +1659,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     assert_equal :ssl_version, @http.ssl_version
     assert_equal 1, @http.ssl_generation
-  end if RUBY_VERSION > '1.9'
+  end unless RUBY_1
 
   def test_start
     c = basic_connection

data/test/test_net_http_persistent_ssl_reuse.rb

@@ -1,15 +1,21 @@
 require 'rubygems'
 require 'minitest/autorun'
 require 'net/http/persistent'
-require 'openssl'
-require 'webrick'
-require 'webrick/ssl'
+have_ssl =
+  begin
+    require 'openssl'
+    require 'webrick'
+    require 'webrick/ssl'
+    true
+  rescue LoadError
+    false
+  end
 
 ##
 # This test is based on (and contains verbatim code from) the Net::HTTP tests
 # in ruby
 
-class TestNetHttpPersistentSSLReuse < MiniTest::Unit::TestCase
+class TestNetHttpPersistentSSLReuse < Minitest::Test
 
   class NullWriter
     def <<(s) end
@@ -102,5 +108,5 @@ class TestNetHttpPersistentSSLReuse < MiniTest::Unit::TestCase
     assert ssl_socket.session_reused?
   end
 
-end
+end if have_ssl
 

metadata

@@ -1,112 +1,90 @@
 --- !ruby/object:Gem::Specification
 name: net-http-persistent
 version: !ruby/object:Gem::Version
-  version: '2.8'
-  prerelease: 
+  version: '2.9'
 platform: ruby
 authors:
 - Eric Hodel
 autorequire: 
 bindir: bin
 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
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDeDCCAmCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBBMRAwDgYDVQQDDAdkcmJy
+  YWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZFgNu
+  ZXQwHhcNMTMwMjI4MDUyMjA4WhcNMTQwMjI4MDUyMjA4WjBBMRAwDgYDVQQDDAdk
+  cmJyYWluMRgwFgYKCZImiZPyLGQBGRYIc2VnbWVudDcxEzARBgoJkiaJk/IsZAEZ
+  FgNuZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCbbgLrGLGIDE76
+  LV/cvxdEzCuYuS3oG9PrSZnuDweySUfdp/so0cDq+j8bqy6OzZSw07gdjwFMSd6J
+  U5ddZCVywn5nnAQ+Ui7jMW54CYt5/H6f2US6U0hQOjJR6cpfiymgxGdfyTiVcvTm
+  Gj/okWrQl0NjYOYBpDi+9PPmaH2RmLJu0dB/NylsDnW5j6yN1BEI8MfJRR+HRKZY
+  mUtgzBwF1V4KIZQ8EuL6I/nHVu07i6IkrpAgxpXUfdJQJi0oZAqXurAV3yTxkFwd
+  g62YrrW26mDe+pZBzR6bpLE+PmXCzz7UxUq3AE0gPHbiMXie3EFE0oxnsU3lIduh
+  sCANiQ8BAgMBAAGjezB5MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgSwMB0GA1UdDgQW
+  BBS5k4Z75VSpdM0AclG2UvzFA/VW5DAfBgNVHREEGDAWgRRkcmJyYWluQHNlZ21l
+  bnQ3Lm5ldDAfBgNVHRIEGDAWgRRkcmJyYWluQHNlZ21lbnQ3Lm5ldDANBgkqhkiG
+  9w0BAQUFAAOCAQEAOflo4Md5aJF//EetzXIGZ2EI5PzKWX/mMpp7cxFyDcVPtTv0
+  js/6zWrWSbd60W9Kn4ch3nYiATFKhisgeYotDDz2/pb/x1ivJn4vEvs9kYKVvbF8
+  V7MV/O5HDW8Q0pA1SljI6GzcOgejtUMxZCyyyDdbUpyAMdt9UpqTZkZ5z1sicgQk
+  5o2XJ+OhceOIUVqVh1r6DNY5tLVaGJabtBmJAYFVznDcHiSFybGKBa5n25Egql1t
+  KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
+  wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
+  -----END CERTIFICATE-----
+date: 2013-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.6'
   type: :development
   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!
-
+        version: '3.6'
+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.'
+  and retry according to RFC 2616.
 email:
 - drbrain@segment7.net
 executables: []
@@ -129,6 +107,7 @@ files:
 - test/test_net_http_persistent_ssl_reuse.rb
 homepage: http://docs.seattlerb.org/net-http-persistent
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --main
@@ -136,22 +115,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: net-http-persistent
-rubygems_version: 1.8.24
+rubygems_version: 2.0.4
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Manages persistent connections using Net::HTTP plus a speed fix for Ruby
   1.8
 test_files: