Merge net-protocol-0.2.1

2 files changed, 9 insertions, 0 deletions

diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 0b775e5841..ea0752a971 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -120,6 +120,7 @@ module Net # :nodoc:
       @continue_timeout = continue_timeout
       @debug_output = debug_output
       @rbuf = ''.b
+      @rbuf_empty = true
       @rbuf_offset = 0
     end
 
diff --git a/test/net/protocol/test_protocol.rb b/test/net/protocol/test_protocol.rb
index 1e38dd6c26..2f42fa3236 100644
--- a/test/net/protocol/test_protocol.rb
+++ b/test/net/protocol/test_protocol.rb
@@ -57,6 +57,14 @@ class TestProtocol < Test::Unit::TestCase
     mockio
   end
 
+  def test_readuntil
+    assert_output("", "") do
+      sio = StringIO.new("12345".dup)
+      io = Net::BufferedIO.new(sio)
+      assert_equal "12345", io.readuntil("5")
+    end
+  end
+
   def test_write0_multibyte
     mockio = create_mockio(max: 1)
     io = Net::BufferedIO.new(mockio)