1 files changed, 10 insertions, 1 deletions
diff --git a/lib/net/ssh/multi/session.rb b/lib/net/ssh/multi/session.rb
index 2e2468f..409aeae 100644
--- a/lib/net/ssh/multi/session.rb
+++ b/lib/net/ssh/multi/session.rb
@@ -425,7 +425,7 @@ module Net; module SSH; module Multi
     # +false+ (the block returned +false+).
     def process(wait=nil, &block)
       realize_pending_connections!
-      wait = @connect_threads.any? ? 0 : wait
+      wait = @connect_threads.any? ? 0 : io_select_wait(wait)
 
       return false unless preprocess(&block)
 
@@ -441,6 +441,15 @@ module Net; module SSH; module Multi
       end
     end
 
+    def io_select_wait(wait)
+      [wait, keepalive_interval].compact.min
+    end
+
+    def keepalive_interval
+      servers = server_list.select { |s| s.options[:keepalive] }
+      servers.map { |s| s.options[:keepalive_interval] }.compact.min
+    end
+
     # Runs the preprocess stage on all servers. Returns false if the block
     # returns false, and true if there either is no block, or it returns true.
     # This is called as part of the #process method.