Land rapid7#4838, reverse_http{,s} listening service fix

Author: wvu

lib/msf/core/handler/reverse_http.rb

@@ -157,26 +157,15 @@ def setup_handler
     print_status("Started #{scheme.upcase} reverse handler on #{listener_uri}")
   end
 
-  #
-  # Simply calls stop handler to ensure that things are cool.
-  #
-  def cleanup_handler
-    stop_handler
-  end
-
-  #
-  # Basically does nothing.  The service is already started and listening
-  # during set up.
-  #
-  def start_handler
-  end
-
   #
   # Removes the / handler, possibly stopping the service if no sessions are
   # active on sub-urls.
   #
   def stop_handler
-    self.service.remove_resource("/") if self.service
+    if self.service
+      self.service.remove_resource("/")
+      Rex::ServiceManager.stop_service(self.service) if self.pending_connections == 0
+    end
   end
 
   attr_accessor :service # :nodoc:
@@ -228,6 +217,7 @@ def on_request(cli, req, obj)
           :comm_timeout       => datastore['SessionCommunicationTimeout'].to_i,
           :ssl                => ssl?,
         })
+        self.pending_connections += 1
 
       when /^\/INITJM/
         conn_id = generate_uri_checksum(URI_CHECKSUM_CONN) + "_" + Rex::Text.rand_text_alphanumeric(16)