net-http-persistent 1.2.3 → 1.2.4

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.2.4 / 2010-07-26
+
+* Bug Fixes
+  * Actually have #request only finish a connection.  Somehow this got
+    missed.
+
 === 1.2.3 / 2010-06-29
 
 * Bug Fixes

data/lib/net/http/persistent.rb

@@ -36,7 +36,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.2.3'
+  VERSION = '1.2.4'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -344,7 +344,7 @@ class Net::HTTP::Persistent
     rescue Net::HTTPBadResponse => e
       message = error_message connection
 
-      reset connection
+      finish connection
 
       raise Error, "too many bad responses #{message}" if
         bad_response or not idempotent? req
@@ -356,7 +356,7 @@ class Net::HTTP::Persistent
       due_to = "(due to #{e.message} - #{e.class})"
       message = error_message connection
 
-      reset connection
+      finish connection
 
       raise Error, "too many connection resets #{due_to} #{message}" if
         retried or not idempotent? req

data/test/test_net_http_persistent.rb

@@ -369,6 +369,22 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_match %r%too many bad responses%, e.message
   end
 
+  def test_request_reset_retry
+    c = connection
+    def c.request(*a)
+      def self.request(*a)
+        :response
+      end
+
+      raise Net::HTTPBadResponse
+    end
+
+    res = @http.request @uri
+
+    assert_equal :response, res
+    assert c.finished?
+  end
+
   def test_request_bad_response_unsafe
     c = connection
     def c.request(*a)
@@ -423,6 +439,22 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_match %r%too many connection resets%, e.message
   end
 
+  def test_request_reset_retry
+    c = connection
+    def c.request(*a)
+      def self.request(*a)
+        :response
+      end
+
+      raise Errno::ECONNRESET
+    end
+
+    res = @http.request @uri
+
+    assert_equal :response, res
+    assert c.finished?
+  end
+
   def test_request_reset_unsafe
     c = connection
     def c.request(*a)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 2
-  - 3
-  version: 1.2.3
+  - 4
+  version: 1.2.4
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-06-29 00:00:00 -07:00
+date: 2010-07-26 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency