diff --git a/lib/core/settings.py b/lib/core/settings.py index 89be99eae..64ff9fa6c 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import DBMS_DIRECTORY_NAME from lib.core.enums import OS # sqlmap version (...) -VERSION = "1.1.12.6" +VERSION = "1.1.12.7" TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable" TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34} VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE) @@ -202,6 +202,11 @@ DUMMY_USER_PREFIX = "__dummy__" # Reference: http://en.wikipedia.org/wiki/ISO/IEC_8859-1 DEFAULT_PAGE_ENCODING = "iso-8859-1" +try: + unicode(DEFAULT_PAGE_ENCODING, DEFAULT_PAGE_ENCODING) +except LookupError: + DEFAULT_PAGE_ENCODING = "utf8" + # URL used in dummy runs DUMMY_URL = "http://foo/bar?id=1" diff --git a/lib/request/basic.py b/lib/request/basic.py index 477a8d849..424b5bf74 100644 --- a/lib/request/basic.py +++ b/lib/request/basic.py @@ -299,8 +299,7 @@ def decodePage(page, contentEncoding, contentType): metaCharset = checkCharEncoding(extractRegexResult(META_CHARSET_REGEX, page)) - if (any((httpCharset, metaCharset)) and not all((httpCharset, metaCharset)))\ - or (httpCharset == metaCharset and all((httpCharset, metaCharset))): + if (any((httpCharset, metaCharset)) and not all((httpCharset, metaCharset))) or (httpCharset == metaCharset and all((httpCharset, metaCharset))): kb.pageEncoding = httpCharset or metaCharset # Reference: http://bytes.com/topic/html-css/answers/154758-http-equiv-vs-true-header-has-precedence debugMsg = "declared web page charset '%s'" % kb.pageEncoding singleTimeLogMessage(debugMsg, logging.DEBUG, debugMsg) diff --git a/txt/checksum.md5 b/txt/checksum.md5 index d0c89e74e..ee3376ba1 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -46,7 +46,7 @@ f872699e948d0692ce11b54781da814c lib/core/log.py 760d9df2a27ded29109b390ab202e72d lib/core/replication.py a2466b62e67f8b31736bac4dac590e51 lib/core/revision.py 02d4762140a72fd44668d3dab5eabda9 lib/core/session.py -c56f644ba673e1ac93ba180b1283bcc1 lib/core/settings.py +337545ac8dad16abc298b71b1d1c4364 lib/core/settings.py 35bffbad762eb9e03db9e93b1c991103 lib/core/shell.py a59ec28371ae067a6fdd8f810edbee3d lib/core/subprocessng.py d93501771b41315f9fb949305b6ed257 lib/core/target.py @@ -66,7 +66,7 @@ e07930095e56de11c297d7ac1a1706f2 lib/parse/html.py d8d9bcf9e7107a5e2cf2dd10f115ac28 lib/parse/payloads.py 2b87577dc6d3609e96fc1e049def5b4f lib/parse/sitemap.py d2f13a0e2fef5273d419d06e516122e1 lib/request/basicauthhandler.py -9ef264b5c0f9e7989b8c2ab91d40400d lib/request/basic.py +4f8b3d682093fc577592e85999400149 lib/request/basic.py 28348595147a731677c8bef470c6f57a lib/request/comparison.py ae823462aad7cd1081e6609192ba3109 lib/request/connect.py ad6f76839408d827abfcdc57813f8518 lib/request/direct.py