net-http-persistent 1.4.1 → 1.5

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.5 / 2011-01-25
+
+* Minor Enhancements
+  * Set TCP_NODELAY on created socket if possible.  (This will only help for
+    requests that send bodies.)
+
 === 1.4.1 / 2010-10-13
 
 * Bug Fixes

data/Manifest.txt

@@ -1,4 +1,5 @@
 .autotest
+.gemtest
 History.txt
 Manifest.txt
 README.txt

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.4.1'
+  VERSION = '1.5'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -224,6 +224,11 @@ class Net::HTTP::Persistent
       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
+    end
+
     connection
   rescue Errno::ECONNREFUSED
     raise Error, "connection refused: #{connection.address}:#{connection.port}"

data/test/test_net_http_persistent.rb

@@ -7,9 +7,17 @@ class Net::HTTP
   alias orig_connect connect
 
   def connect
-    return unless use_ssl?
+    unless use_ssl? then
+      io = Object.new
+      def io.setsockopt(*a) @setsockopt = a end
+
+      @socket = Net::BufferedIO.new io
+
+      return
+    end
 
     io = open '/dev/null'
+    def io.setsockopt(*a) @setsockopt = a end
 
     @ssl_context ||= OpenSSL::SSL::SSLContext.new
 
@@ -51,9 +59,13 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     end
     def finish
       @finished += 1
+      @socket = nil
     end
     def start
       @started += 1
+      io = Object.new
+      def io.setsockopt(*a) @setsockopt = a end
+      @socket = Net::BufferedIO.new io
     end
     def reset?
       @started == @finished + 1
@@ -132,6 +144,15 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     assert_includes conns.keys, 'example.com:80'
     assert_same c, conns['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
+                 nil
+               end
+
+    assert_equal expected, socket.io.instance_variable_get(:@setsockopt)
   end
 
   def test_connection_for_cached

metadata

@@ -5,9 +5,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
-  - 4
-  - 1
-  version: 1.4.1
+  - 5
+  version: "1.5"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,57 +35,41 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-10-13 00:00:00 -07:00
+date: 2011-01-25 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rubyforge
+  name: minitest
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 11
         segments: 
         - 2
         - 0
-        - 4
-        version: 2.0.4
+        - 2
+        version: 2.0.2
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: hoe
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 47
         segments: 
-        - 1
-        - 5
+        - 2
+        - 8
         - 0
-        version: 1.5.0
+        version: 2.8.0
   type: :development
   version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: hoe
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 2
-        - 6
-        - 1
-        version: 2.6.1
-  type: :development
-  version_requirements: *id003
 description: |-
   Persistent connections using Net::HTTP plus a speed fix for 1.8.  It's
   thread-safe too!
@@ -102,6 +85,7 @@ extra_rdoc_files:
 - README.txt
 files: 
 - .autotest
+- .gemtest
 - History.txt
 - Manifest.txt
 - README.txt