Land rapid7#9178, multi/handler enhancements rollback

Author: wvu

modules/exploits/multi/handler.rb

@@ -34,15 +34,14 @@ def initialize(info = {})
         'Arch'           => ARCH_ALL,
         'Targets'        => [ [ 'Wildcard Target', {} ] ],
         'DefaultTarget'  => 0,
-        'Stance'         => Msf::Exploit::Stance::Passive
       )
     )
 
     register_advanced_options(
       [
         OptBool.new(
           "ExitOnSession",
-          [ true, "Return from the exploit after a session has been created", false ]
+          [ true, "Return from the exploit after a session has been created", true ]
         ),
         OptInt.new(
           "ListenerTimeout",
@@ -58,7 +57,7 @@ def exploit
     loop do
       break if session_created? && datastore['ExitOnSession']
       break if timeout > 0 && (stime + timeout < Time.now.to_f)
-      sleep(1)
+      Rex::ThreadSafe.sleep(1)
     end
   end
 end