Major bug fix to correctly handle httplib.BadStatusLine exception.

Minor improvement to set by default in all HTTP requests the standard HTTP headers (Accept, Accept-Encoding, etc.)
Updated user's manual.

lib/core/option.py

@@ -278,6 +278,13 @@ def __setHTTPMethod():
         conf.method = "GET"
 
 
+def __setHTTPStandardHeaders():
+    conf.httpHeaders.append(("Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8"))
+    conf.httpHeaders.append(("Accept-Language", "en-us,en;q=0.5"))
+    conf.httpHeaders.append(("Accept-Encoding", "gzip,deflate"))
+    conf.httpHeaders.append(("Accept-Charset", "ISO-8859-15,utf-8;q=0.7,*;q=0.7"))
+
+
 def __defaultHTTPUserAgent():
     """
     @return: default sqlmap HTTP User-Agent header
@@ -566,6 +573,7 @@ def init(inputOptions=advancedDict()):
     __setHTTPCookies()
     __setHTTPReferer()
     __setHTTPUserAgent()
+    __setHTTPStandardHeaders()
     __setHTTPMethod()
     __setHTTPAuthentication()
     __setHTTPProxy()

lib/request/connect.py

@@ -24,6 +24,7 @@ Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 
+import httplib
 import md5
 import re
 import socket
@@ -182,6 +183,19 @@ class Connect:
                 warnMsg += " or proxy"
                 raise sqlmapConnectionException, warnMsg
 
+        except httplib.BadStatusLine, _:
+            warnMsg = "the target url responded with an unknown HTTP "
+            warnMsg += "status code, try to force the HTTP User-Agent "
+            warnMsg += "header with option --user-agent or -a"
+
+            if conf.googleDork:
+                warnMsg += ", skipping to next url"
+                logger.warn(warnMsg)
+
+                return None
+            else:
+                raise sqlmapConnectionException, warnMsg
+
         parsePage(page)
         responseMsg += "(%s - %d):\n" % (status, code)