net-http-persistent 2.5 → 2.5.1

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.5.1 / 2012-02-10
+
+* Bug fix
+  * Reusing SSL connections with HTTP proxies now works.  Issue #15 by Paul
+    Ingham and mcrmfc
+
 === 2.5 / 2012-02-07
 
 * Minor enhancements

data/lib/net/http/persistent.rb

@@ -172,7 +172,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.5'
+  VERSION = '2.5.1'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various

data/lib/net/http/persistent/ssl_reuse.rb

@@ -43,7 +43,6 @@ class Net::HTTP::Persistent::SSLReuse < Net::HTTP
         @ssl_context.set_params(ssl_parameters)
       end
       s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-      s.session = @ssl_session if @ssl_session
       s.sync_close = true
     end
     @socket = Net::BufferedIO.new(s)
@@ -65,6 +64,7 @@ class Net::HTTP::Persistent::SSLReuse < Net::HTTP
           @socket.writeline ''
           Net::HTTPResponse.read_new(@socket).value
         end
+        s.session = @ssl_session if @ssl_session
         # Server Name Indication (SNI) RFC 3546
         s.hostname = @address if s.respond_to? :hostname=
         timeout(@open_timeout) { s.connect }
@@ -85,7 +85,7 @@ class Net::HTTP::Persistent::SSLReuse < Net::HTTP
   # From ruby_1_8_7 branch r29865 including a modified
   # http://redmine.ruby-lang.org/issues/5341
 
-  def connect
+  def connect # :nodoc:
     D "opening connection to #{conn_address()}..."
     s = timeout(@open_timeout) { TCPSocket.open(conn_address(), conn_port()) }
     D "opened"
@@ -95,7 +95,6 @@ class Net::HTTP::Persistent::SSLReuse < Net::HTTP
         @ssl_context.verify_mode = OpenSSL::SSL::VERIFY_NONE
       end
       s = OpenSSL::SSL::SSLSocket.new(s, @ssl_context)
-      s.session = @ssl_session if @ssl_session
       s.sync_close = true
     end
     @socket = Net::BufferedIO.new(s)
@@ -114,6 +113,7 @@ class Net::HTTP::Persistent::SSLReuse < Net::HTTP
         @socket.writeline ''
         Net::HTTPResponse.read_new(@socket).value
       end
+      s.session = @ssl_session if @ssl_session
       s.connect
       if @ssl_context.verify_mode != OpenSSL::SSL::VERIFY_NONE
         s.post_connection_check(@address)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 25
   prerelease: 
   segments: 
   - 2
   - 5
-  version: "2.5"
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +36,7 @@ cert_chain:
   YJY7T/W2n+eWy8WuPhzVUkyzguj0bQe27NDeabgCh2mHd4Hynk2AkYh8MQ==
   -----END CERTIFICATE-----
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest