net-http-persistent 1.3 → 1.3.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 1.3.1 / 2010-09-13
+
+* Bug Fixes
+  * #connection_for no longer tries to ssl-enable an existing connection.
+    Patch by Joseph West.
+
 === 1.3 / 2010-09-08
 
 * 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.3'
+  VERSION = '1.3.1'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -198,6 +198,8 @@ class Net::HTTP::Persistent
 
   def connection_for uri
     Thread.current[@connection_key] ||= {}
+    Thread.current[@request_key]    ||= Hash.new 0
+
     connections = Thread.current[@connection_key]
 
     net_http_args = [uri.host, uri.port]
@@ -208,16 +210,17 @@ class Net::HTTP::Persistent
       net_http_args.concat @proxy_args
     end
 
-    connections[connection_id] ||= Net::HTTP.new(*net_http_args)
-    connection = connections[connection_id]
+    unless connection = connections[connection_id] then
+      connections[connection_id] = Net::HTTP.new(*net_http_args)
+      connection = connections[connection_id]
+      ssl connection if uri.scheme == 'https'
+    end
 
     unless connection.started? then
       connection.set_debug_output @debug_output if @debug_output
       connection.open_timeout = @open_timeout if @open_timeout
       connection.read_timeout = @read_timeout if @read_timeout
 
-      ssl connection if uri.scheme == 'https'
-
       connection.start
     end
 
@@ -336,7 +339,6 @@ class Net::HTTP::Persistent
   # it will be retried automatically.
 
   def request uri, req = nil, &block
-    Thread.current[@request_key] ||= Hash.new 0
     retried      = false
     bad_response = false
 

data/test/test_net_http_persistent.rb

@@ -7,6 +7,18 @@ class Net::HTTP
   alias orig_connect connect
 
   def connect
+    return unless use_ssl?
+
+    io = open '/dev/null'
+
+    @ssl_context ||= OpenSSL::SSL::SSLContext.new
+
+    @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_PEER unless
+      @ssl_context.verify_mode
+
+    s = OpenSSL::SSL::SSLSocket.new io, @ssl_context
+
+    @socket = Net::BufferedIO.new s
   end
 end
 
@@ -136,6 +148,22 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_same c, conns['example.com:80']
   end
 
+  def test_connection_for_finished_ssl
+    uri = URI.parse 'https://example.com/path'
+    c = @http.connection_for uri
+
+    assert c.started?
+    assert c.use_ssl?
+
+    @http.finish c
+
+    refute c.started?
+
+    c2 = @http.connection_for uri
+
+    assert c2.started?
+  end
+
   def test_connection_for_host_down
     cached = Object.new
     def cached.address; 'example.com' end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  version: "1.3"
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2010-09-08 00:00:00 -07:00
+date: 2010-09-13 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency