one bug fix for Host header (value should be without port number); one improvement for --tables - when no tables ask user if he wants to brute force them; one tweak - adding kb.ignoreTimeout for --tables

lib/core/common.py

@@ -2573,3 +2573,19 @@ def isBinaryData(value):
     if isinstance(value, basestring):
        retVal = reduce(lambda x, y: x or not (y in string.printable or ord(y) > 255), value, False)
     return retVal
+
+def isNoneValue(value):
+    """
+    Returns whether the value contains implicit 'None' value
+    """
+
+    if isinstance(value, basestring):
+        return value == "None"
+    elif isinstance(value, list):
+        return value == [None]
+    elif isinstance(value, tuple):
+        return value == (None)
+    elif isinstance(value, dict):
+        return len(value) == 1 and any(map(lambda x: x in value, [None, "None"]))
+    else:
+        return value is None

lib/request/connect.py

@@ -187,7 +187,7 @@ class Connect:
             if kb.proxyAuthHeader:
                 headers[HTTPHEADER.PROXY_AUTHORIZATION] = kb.proxyAuthHeader
 
-            headers[HTTPHEADER.HOST] = host or urlparse.urlparse(url).netloc
+            headers[HTTPHEADER.HOST] = host or urlparse.urlparse(url).netloc.split(':')[0]
 
             if auxHeaders:
                 for key, item in auxHeaders.items():