mirror of
https://github.com/sqlmapproject/sqlmap.git
synced 2025-02-18 04:20:35 +03:00
more update related to last commits
This commit is contained in:
parent
570d3a19c2
commit
5afbd52b61
|
@ -732,9 +732,9 @@ def dataToStdout(data, forceOutput=False):
|
||||||
sys.stdout.write(data.encode(UNICODE_ENCODING))
|
sys.stdout.write(data.encode(UNICODE_ENCODING))
|
||||||
finally:
|
finally:
|
||||||
sys.stdout.flush()
|
sys.stdout.flush()
|
||||||
setFormatterPrependFlag(len(data) == 1)
|
|
||||||
if kb.get("multiThreadMode"):
|
if kb.get("multiThreadMode"):
|
||||||
logging._releaseLock()
|
logging._releaseLock()
|
||||||
|
setFormatterPrependFlag(len(data) == 1)
|
||||||
|
|
||||||
def dataToSessionFile(data):
|
def dataToSessionFile(data):
|
||||||
if not conf.sessionFile or kb.suppressSession:
|
if not conf.sessionFile or kb.suppressSession:
|
||||||
|
|
|
@ -23,6 +23,7 @@ from lib.core.common import goGoodSamaritan
|
||||||
from lib.core.common import getPartRun
|
from lib.core.common import getPartRun
|
||||||
from lib.core.common import incrementCounter
|
from lib.core.common import incrementCounter
|
||||||
from lib.core.common import safeStringFormat
|
from lib.core.common import safeStringFormat
|
||||||
|
from lib.core.common import setFormatterPrependFlag
|
||||||
from lib.core.common import singleTimeWarnMessage
|
from lib.core.common import singleTimeWarnMessage
|
||||||
from lib.core.data import conf
|
from lib.core.data import conf
|
||||||
from lib.core.data import kb
|
from lib.core.data import kb
|
||||||
|
@ -319,6 +320,8 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
|
||||||
progress.update(index)
|
progress.update(index)
|
||||||
progress.draw(eta)
|
progress.draw(eta)
|
||||||
|
|
||||||
|
setFormatterPrependFlag(True)
|
||||||
|
|
||||||
# Go multi-threading (--threads > 1)
|
# Go multi-threading (--threads > 1)
|
||||||
if conf.threads > 1 and isinstance(length, int) and length > 1:
|
if conf.threads > 1 and isinstance(length, int) and length > 1:
|
||||||
value = []
|
value = []
|
||||||
|
@ -504,6 +507,8 @@ def bisection(payload, expression, length=None, charsetType=None, firstChar=None
|
||||||
|
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
abortedFlag = True
|
abortedFlag = True
|
||||||
|
finally:
|
||||||
|
setFormatterPrependFlag(False)
|
||||||
|
|
||||||
if conf.verbose in (1, 2) or showEta:
|
if conf.verbose in (1, 2) or showEta:
|
||||||
dataToStdout("\n")
|
dataToStdout("\n")
|
||||||
|
|
Loading…
Reference in New Issue
Block a user