1 files changed, 3 insertions, 4 deletions
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 1ba18d816b..37b4269f29 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -129,10 +129,9 @@ module Net # :nodoc:
     private
 
     def rbuf_fill
-      until IO.select([@io], nil, nil, @read_timeout)
-        raise TimeoutError, "socket read timeout (#{@read_timeout} sec)"
-      end
-      @rbuf << @io.sysread(1024)
+      timeout(@read_timeout) {
+        @rbuf << @io.sysread(1024)
+      }
     end
 
     def rbuf_consume(len)