From 1e7a453ff6acb14892c0460083ab08944a559d24 Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Wed, 18 Jan 2017 10:19:23 +0100 Subject: [PATCH] Fixes #2356 --- lib/core/settings.py | 2 +- lib/core/threads.py | 5 ++--- txt/checksum.md5 | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/core/settings.py b/lib/core/settings.py index bc6f06813..f4c11fc49 100755 --- 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.1.10" +VERSION = "1.1.1.11" 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) diff --git a/lib/core/threads.py b/lib/core/threads.py index 650301cb7..3b807ca27 100644 --- a/lib/core/threads.py +++ b/lib/core/threads.py @@ -7,12 +7,11 @@ See the file 'doc/COPYING' for copying permission import difflib import random +import thread import threading import time import traceback -from thread import error as ThreadError - from lib.core.data import conf from lib.core.data import kb from lib.core.data import logger @@ -151,7 +150,7 @@ def runThreads(numThreads, threadFunction, cleanupFunction=None, forwardExceptio try: thread.start() - except ThreadError, ex: + except thread.error, ex: errMsg = "error occurred while starting new thread ('%s')" % ex.message logger.critical(errMsg) break diff --git a/txt/checksum.md5 b/txt/checksum.md5 index a7d6b5b56..d9b367dcc 100644 --- a/txt/checksum.md5 +++ b/txt/checksum.md5 @@ -45,12 +45,12 @@ e544108e2238d756c94a240e8a1ce061 lib/core/optiondict.py d8e9250f3775119df07e9070eddccd16 lib/core/replication.py 785f86e3f963fa3798f84286a4e83ff2 lib/core/revision.py 40c80b28b3a5819b737a5a17d4565ae9 lib/core/session.py -800e6d250a33cd2c809154e724b0870a lib/core/settings.py +f5c3572d071e44ca33347de2a6dfe44f lib/core/settings.py d91291997d2bd2f6028aaf371bf1d3b6 lib/core/shell.py 2ad85c130cc5f2b3701ea85c2f6bbf20 lib/core/subprocessng.py afd0636d2e93c23f4f0a5c9b6023ea17 lib/core/target.py 8970b88627902239d695280b1160e16c lib/core/testing.py -ce5578a2e6b25dc6fd115133f92e0643 lib/core/threads.py +1504e8c6bdd69edc17b5f240eaa73fb2 lib/core/threads.py ad74fc58fc7214802fd27067bce18dd2 lib/core/unescaper.py 1f1fa616b5b19308d78c610ec8046399 lib/core/update.py 4d13ed693401a498b6d073a2a494bd83 lib/core/wordlist.py