httpclient 2.2.3 → 2.2.4

data/lib/httpclient.rb

@@ -231,8 +231,7 @@ require 'httpclient/cookie'
 #
 class HTTPClient
   RUBY_VERSION_STRING = "ruby #{RUBY_VERSION} (#{RUBY_RELEASE_DATE}) [#{RUBY_PLATFORM}]"
-  /: (\S+) (\S+)/ =~ %q$Id$
-  LIB_NAME = "(#{$1}/#{$2}, #{RUBY_VERSION_STRING})"
+  LIB_NAME = "(#{VERSION}, #{RUBY_VERSION_STRING})"
 
   include Util
 
@@ -337,6 +336,8 @@ class HTTPClient
   attr_proxy(:receive_timeout, true)
   # Reuse the same connection within this timeout in sec. from last used.
   attr_proxy(:keep_alive_timeout, true)
+  # Size of reading block for non-chunked response.
+  attr_proxy(:read_block_size, true)
   # Negotiation retry count for authentication.  5 by default.
   attr_proxy(:protocol_retry_count, true)
   # if your ruby is older than 2005-09-06, do not set socket_sync = false to

data/lib/httpclient/session.rb

@@ -918,8 +918,8 @@ class HTTPClient
 
     def read_body_length(&block)
       return nil if @content_length == 0
-      buf = ''
       while true
+        buf = ''
         maxbytes = @read_block_size
         maxbytes = @content_length if maxbytes > @content_length
         timeout(@receive_timeout, ReceiveTimeoutError) do
@@ -969,8 +969,8 @@ class HTTPClient
         yield @readbuf
         @readbuf = nil
       end
-      buf = ''
       while true
+        buf = ''
         timeout(@receive_timeout, ReceiveTimeoutError) do
           begin
             @socket.readpartial(@read_block_size, buf)

data/lib/httpclient/version.rb

@@ -1,3 +1,3 @@
 class HTTPClient
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

data/test/test_httpclient.rb

@@ -33,7 +33,7 @@ class TestHTTPClient < Test::Unit::TestCase
     @client.get(serverurl)
     lines = str.split(/(?:\r?\n)+/)
     assert_equal("= Request", lines[0])
-    assert_match(/^User-Agent: agent_name_foo/, lines[4])
+    assert_match(/^User-Agent: agent_name_foo \(#{HTTPClient::VERSION}/, lines[4])
   end
 
   def test_from
@@ -591,6 +591,16 @@ EOS
     assert_nil(res.content)
   end
 
+  def test_get_with_block_chunk_string_recycle
+    @client.read_block_size = 2
+    body = []
+    res = @client.get(serverurl + 'servlet') { |str|
+      body << str
+    }
+    assert_equal(2, body.size)
+    assert_equal("get", body.join) # Was "tt" by String object recycle...
+  end
+
   def test_post
     assert_equal("post", @client.post(serverurl + 'servlet').content[0, 4])
     res = @client.post(serverurl + 'servlet', {1=>2, 3=>4})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: httpclient
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-28 00:00:00.000000000 Z
+date: 2011-12-08 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: nahi@ruby-lang.org