From a7fac41172d2d63b373eeef8bfd0c7bf7546fe20 Mon Sep 17 00:00:00 2001
From: William Vu <William_Vu@rapid7.com>
Date: Fri, 20 Jan 2017 23:09:22 -0600
Subject: [PATCH] Make shell_command_token time out again

---
 lib/msf/core/session/provider/single_command_shell.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/msf/core/session/provider/single_command_shell.rb b/lib/msf/core/session/provider/single_command_shell.rb
index 8be21f0a0b..45395fc895 100644
--- a/lib/msf/core/session/provider/single_command_shell.rb
+++ b/lib/msf/core/session/provider/single_command_shell.rb
@@ -43,6 +43,8 @@ module SingleCommandShell
   # Read data until we find the token
   #
   def shell_read_until_token(token, wanted_idx=0, timeout=10)
+    return if timeout.to_i == 0
+
     if (wanted_idx == 0)
       parts_needed = 2
     else