net-http-persistent 1.5 → 1.5.1

data/History.txt

@@ -1,3 +1,8 @@
+=== 1.5.1 / 2011-02-10
+
+* Bug fix
+  * Only set TCP_NODELAY at connection start.  Reported by Brian Henderson.
+
 === 1.5 / 2011-01-25
 
 * Minor Enhancements

data/lib/net/http/persistent.rb

@@ -37,7 +37,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent use are using
 
-  VERSION = '1.5'
+  VERSION = '1.5.1'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -222,11 +222,11 @@ class Net::HTTP::Persistent
       connection.read_timeout = @read_timeout if @read_timeout
 
       connection.start
-    end
 
-    if Socket.const_defined? :TCP_NODELAY then
-      socket = connection.instance_variable_get :@socket
-      socket.io.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+      if Socket.const_defined? :TCP_NODELAY then
+        socket = connection.instance_variable_get :@socket
+        socket.io.setsockopt Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1
+      end
     end
 
     connection

data/test/test_net_http_persistent.rb

@@ -167,6 +167,27 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_same cached, c
   end
 
+  def test_connection_for_closed
+    cached = basic_connection
+    cached.start
+    if Socket.const_defined? :TCP_NODELAY then
+      def (cached.instance_variable_get(:@socket).io).setsockopt(*a)
+        raise IOError, 'closed stream'
+      end
+    end
+    conns['example.com:80'] = cached
+
+    c = @http.connection_for @uri
+
+    assert c.started?
+
+    assert_includes conns.keys, 'example.com:80'
+    assert_same c, conns['example.com:80']
+
+    socket = c.instance_variable_get :@socket
+    assert_nil socket.io.instance_variable_get(:@setsockopt)
+  end
+
   def test_connection_for_debug_output
     io = StringIO.new
     @http.debug_output = io

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 5
-  prerelease: false
+  hash: 1
+  prerelease: 
   segments: 
   - 1
   - 5
-  version: "1.5"
+  - 1
+  version: 1.5.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-01-25 00:00:00 -08:00
+date: 2011-02-10 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,12 +63,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 43
         segments: 
         - 2
-        - 8
+        - 9
         - 0
-        version: 2.8.0
+        version: 2.9.0
   type: :development
   version_requirements: *id002
 description: |-
@@ -124,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.3.7
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: Persistent connections using Net::HTTP plus a speed fix for 1.8