Merge remote-tracking branch 'upstream/master'

Author: x2020

lib/msf/core/exploit/http/client.rb

@@ -366,7 +366,7 @@ def send_request_cgi(opts={}, timeout = 20)
         print_line('#' * 20)
         print_line(res.to_s)
       end
-
+      disconnect(c)
       res
     rescue ::Errno::EPIPE, ::Timeout::Error => e
       print_line(e.message) if datastore['HttpTrace']

modules/auxiliary/scanner/http/cisco_ironport_enum.rb

@@ -61,6 +61,7 @@ def check_conn?
         'method'    => 'GET'
       })
       print_good("#{rhost}:#{rport} - Server is responsive...")
+      return 1
     rescue ::Rex::ConnectionRefused, ::Rex::HostUnreachable, ::Rex::ConnectionTimeout, ::Rex::ConnectionError, ::Errno::EPIPE
       return
     end

modules/auxiliary/scanner/http/owa_login.rb

@@ -195,7 +195,7 @@ def try_user_pass(opts)
 
     if not res
       print_error("#{msg} HTTP Connection Error, Aborting")
-      return :abort
+      return
     end
 
     if action.name != "OWA_2013" and res.get_cookies.empty?

scripts/resource/auto_win32_multihandler.rc

@@ -13,6 +13,10 @@ def out_path
   "#{Msf::Config::local_directory}/meterpreter_reverse_tcp.exe"
 end
 
+# Please see:
+# https://github.com/rapid7/metasploit-framework/issues/7603
+sleep(1)
+
 run_single("use payload/#{PAYLOAD}")
 run_single("set lhost #{payload_lhost}")
 run_single("set lport #{payload_lport}")
@@ -25,4 +29,4 @@ run_single("set lhost #{payload_lhost}")
 run_single("set lport #{payload_lport}")
 run_single('set exitonsession false')
 run_single('run -j')
-</ruby>
+</ruby>