1 files changed, 9 insertions, 3 deletions
diff --git a/lib/net/protocol.rb b/lib/net/protocol.rb
index 0d489cdbc8..3f6f416bab 100644
--- a/lib/net/protocol.rb
+++ b/lib/net/protocol.rb
@@ -131,9 +131,15 @@ module Net # :nodoc:
     BUFSIZE = 1024 * 16
 
     def rbuf_fill
-      timeout(@read_timeout) {
-        @rbuf << @io.sysread(BUFSIZE)
-      }
+      begin
+        @rbuf << @io.read_nonblock(BUFSIZE)
+      rescue Errno::EWOULDBLOCK
+        if IO.select([@io], nil, nil, @read_timeout)
+          @rbuf << @io.read_nonblock(BUFSIZE)
+        else
+          raise Timeout::TimeoutError
+        end
+      end
     end
 
     def rbuf_consume(len)