Land rapid7#7210, allow send_request_cgi to close a non-global socket

Author: Brent Cook

lib/msf/core/auxiliary/scanner.rb

@@ -41,6 +41,7 @@ def setup
 
 def cleanup
   datastore['RHOST'] = @original_rhost
+  super
 end
 
 

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

@@ -210,10 +210,10 @@ def connect(opts={})
       if (self.client)
         disconnect
       end
-
-      self.client = nclient
     end
 
+    self.client = nclient
+
     return nclient
   end
 
@@ -297,6 +297,10 @@ def disconnect(nclient = self.client)
     end
 
     if (nclient == self.client)
+      if self.client.respond_to?(:close)
+        self.client.close
+      end
+
       self.client = nil
     end
   end