net-http-persistent 1.5.2 → 1.6

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.6 / 2011-03-01
+
+* Minor Engancement
+  * Added Net::HTTP::Persistent#socket_options to set multiple socket options
+    at socket startup.
+
 === 1.5.2 / 2011-02-24
 
 * Bug Fix

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.2'
+  VERSION = '1.6'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -123,6 +123,17 @@ class Net::HTTP::Persistent
 
   attr_reader :request_key # :nodoc:
 
+  ##
+  # An array of options for Socket#setsockopt.
+  #
+  # By default the TCP_NODELAY option is set on sockets.
+  #
+  # To set additional options append them to this array:
+  #
+  #   http.socket_options << [Socket::SOL_SOCKET, Socket::SO_KEEPALIVE, 1]
+
+  attr_reader :socket_options
+
   ##
   # SSL verification callback.  Used when ca_file is set.
 
@@ -174,12 +185,16 @@ class Net::HTTP::Persistent
       @proxy_connection_id = [nil, *@proxy_args].join ':'
     end
 
-    @debug_output  = nil
-    @headers       = {}
-    @http_versions = {}
-    @keep_alive    = 30
-    @open_timeout  = nil
-    @read_timeout  = nil
+    @debug_output   = nil
+    @headers        = {}
+    @http_versions  = {}
+    @keep_alive     = 30
+    @open_timeout   = nil
+    @read_timeout   = nil
+    @socket_options = []
+
+    @socket_options << [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1] if
+      Socket.const_defined? :TCP_NODELAY
 
     key = ['net_http_persistent', name, 'connections'].compact.join '_'
     @connection_key = key.intern
@@ -223,10 +238,12 @@ class Net::HTTP::Persistent
 
       connection.start
 
-      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 # for fakeweb
+      socket = connection.instance_variable_get :@socket
+      
+      if socket then # for fakeweb
+        @socket_options.each do |option|
+          socket.io.setsockopt(*option)
+        end
       end
     end
 

data/test/test_net_http_persistent.rb

@@ -9,7 +9,7 @@ class Net::HTTP
   def connect
     unless use_ssl? then
       io = Object.new
-      def io.setsockopt(*a) @setsockopt = a end
+      def io.setsockopt(*a) @setsockopts ||= []; @setsockopts << a end
 
       @socket = Net::BufferedIO.new io
 
@@ -17,7 +17,7 @@ class Net::HTTP
     end
 
     io = open '/dev/null'
-    def io.setsockopt(*a) @setsockopt = a end
+    def io.setsockopt(*a) @setsockopts ||= []; @setsockopts << a end
 
     @ssl_context ||= OpenSSL::SSL::SSLContext.new
 
@@ -64,7 +64,7 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     def start
       @started += 1
       io = Object.new
-      def io.setsockopt(*a) @setsockopt = a end
+      def io.setsockopt(*a) @setsockopts ||= []; @setsockopts << a end
       @socket = Net::BufferedIO.new io
     end
     def reset?
@@ -147,12 +147,12 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
 
     socket = c.instance_variable_get :@socket
     expected = if Socket.const_defined? :TCP_NODELAY then
-                 [Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1]
+                 [[Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1]]
                else
-                 nil
+                 []
                end
 
-    assert_equal expected, socket.io.instance_variable_get(:@setsockopt)
+    assert_equal expected, socket.io.instance_variable_get(:@setsockopts)
   end
 
   def test_connection_for_cached
@@ -271,6 +271,20 @@ 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_error_message
     c = basic_connection
     reqs[c.object_id] = 5

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 3
   prerelease: 
   segments: 
   - 1
-  - 5
-  - 2
-  version: 1.5.2
+  - 6
+  version: "1.6"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -36,7 +35,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-02-24 00:00:00 -08:00
+date: 2011-03-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.5.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Persistent connections using Net::HTTP plus a speed fix for 1.8