lib/net/protocol.rb: account read_bytes before caller sees it

Users may modify the chunk yielded to them in Net::HTTPResponse#read_body.
This will allow users to reduce memory usage by calling
String#clear on the buffer once they're done using it.

* lib/net/protocol.rb (read): increment read_bytes earlier
  (read_all): ditto
* test/net/http/test_httpresponse.rb (test_read_body_block_mod): new test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58846 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 32 insertions, 3 deletions

diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 797966ac7d..0e887d5aa9 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -119,12 +119,14 @@ module Net # :nodoc:
       read_bytes = 0
       begin
         while read_bytes + @rbuf.size < len
-          dest << (s = rbuf_consume(@rbuf.size))
+          s = rbuf_consume(@rbuf.size)
           read_bytes += s.size
+          dest << s
           rbuf_fill
         end
-        dest << (s = rbuf_consume(len - read_bytes))
+        s = rbuf_consume(len - read_bytes)
         read_bytes += s.size
+        dest << s
       rescue EOFError
         raise unless ignore_eof
       end
@@ -137,8 +139,9 @@ module Net # :nodoc:
       read_bytes = 0
       begin
         while true
-          dest << (s = rbuf_consume(@rbuf.size))
+          s = rbuf_consume(@rbuf.size)
           read_bytes += s.size
+          dest << s
           rbuf_fill
         end
       rescue EOFError
diff --git a/test/net/http/test_httpresponse.rb b/test/net/http/test_httpresponse.rb
index a67add7c88..d99c3611c5 100644
--- a/test/net/http/test_httpresponse.rb
+++ b/test/net/http/test_httpresponse.rb
@@ -76,6 +76,32 @@ EOS
     assert_equal 'hello', body
   end
 
+  def test_read_body_block_mod
+    IO.pipe do |r, w|
+      buf = 'x' * 1024
+      buf.freeze
+      n = 1024
+      len = n * buf.size
+      th = Thread.new do
+        w.write("HTTP/1.1 200 OK\r\nContent-Length: #{len}\r\n\r\n")
+        n.times { w.write(buf) }
+        :ok
+      end
+      io = Net::BufferedIO.new(r)
+      res = Net::HTTPResponse.read_new(io)
+      nr = 0
+      res.reading_body io, true do
+        # should be allowed to modify the chunk given to them:
+        res.read_body do |chunk|
+          nr += chunk.size
+          chunk.clear
+        end
+      end
+      assert_equal len, nr
+      assert_equal :ok, th.value
+    end
+  end
+
   def test_read_body_content_encoding_deflate
     io = dummy_io(<<EOS)
 HTTP/1.1 200 OK