Hide RPORT more intelligently

Author: wvu

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

@@ -465,8 +465,15 @@ def target_uri
   # Returns the complete URI as string including the scheme, port and host
   def full_uri(custom_uri = nil)
     uri_scheme = ssl ? 'https' : 'http'
-    uri_port = rport.to_s == '80' ? '' : ":#{rport}"
+
+    if (rport == 80 && !ssl) || (rport == 443 && ssl)
+      uri_port = ''
+    else
+      uri_port = ":#{rport}"
+    end
+
     uri = normalize_uri(custom_uri || target_uri.to_s)
+
     "#{uri_scheme}://#{rhost}#{uri_port}#{uri}"
   end