net-http-persistent 2.3 → 2.3.1

data/History.txt

@@ -1,3 +1,10 @@
+=== 2.3.1 / 2011-10-26
+
+* Bug fix
+  * If a request object already contains a Connection header it will no longer
+    be overridden.  This allows keep-alive connections to be disabled on a
+    per-request basis.
+
 === 2.3 / 2011-10-25
 
 * Minor Enhancement

data/lib/net/http/persistent.rb

@@ -149,7 +149,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.3'
+  VERSION = '2.3.1'
 
   ##
   # Error class for errors raised by Net::HTTP::Persistent.  Various
@@ -576,8 +576,10 @@ class Net::HTTP::Persistent
       req.add_field(*pair)
     end
 
-    req.add_field 'Connection', 'keep-alive'
-    req.add_field 'Keep-Alive', @keep_alive
+    unless req['Connection'] then
+      req.add_field 'Connection', 'keep-alive'
+      req.add_field 'Keep-Alive', @keep_alive
+    end
 
     connection = connection_for uri
     connection_id = connection.object_id

data/test/test_net_http_persistent.rb

@@ -629,6 +629,23 @@ class TestNetHttpPersistent < MiniTest::Unit::TestCase
     assert_equal 1, reqs[c.object_id]
   end
 
+  def test_request_connection
+    c = connection
+
+    request = Net::HTTP::Get.new @uri.request_uri
+    request['connection'] = 'close'
+
+    res = @http.request @uri, request
+    req = c.req
+
+    assert_kind_of Net::HTTPResponse, res
+
+    assert_kind_of Net::HTTP::Get, req
+    assert_equal '/path',      req.path
+    assert_equal 'close',      req['connection']
+    assert_equal nil,          req['keep-alive']
+  end
+
   def test_request_invalid
     c = basic_connection
     def c.request(*a) raise Errno::EINVAL, "write" end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: net-http-persistent
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 3
-  version: "2.3"
+  - 1
+  version: 2.3.1
 platform: ruby
 authors: 
 - Eric Hodel
@@ -35,7 +36,7 @@ cert_chain:
   x52qPcexcYZR7w==
   -----END CERTIFICATE-----
 
-date: 2011-10-25 00:00:00 Z
+date: 2011-10-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: minitest