PenTest/sqlmap
1
0
Fork 0
mirror of https://github.com/sqlmapproject/sqlmap.git synced 2025-12-08 05:31:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:sqlmapproject/sqlmap

Browse Source
This commit is contained in:
Bernardo Damele
2013-01-29 15:38:16 +00:00
parent 1152cf8958 55a9f91bbf
commit c47b44e93f
5 changed files with 19 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/core/common.py
View File

@@ -1360,7 +1360,7 @@ def normalizePath(filepath):
retVal = filepath
if retVal:
retVal = retVal.strip("\r").strip("\n")
retVal = retVal.strip("\r\n")
retVal = ntpath.normpath(retVal) if isWindowsDriveLetterPath(retVal) else posixpath.normpath(retVal)
return retVal

6
lib/core/option.py
View File

@@ -916,7 +916,7 @@ def _setDNSCache():
def _setHTTPProxy():
"""
Check and set the HTTP proxy to pass by all HTTP requests.
Check and set the HTTP/SOCKS proxy for all HTTP requests.
"""
global proxyHandler
@@ -927,7 +927,7 @@ def _setHTTPProxy():
return
debugMsg = "setting the HTTP/SOCKS proxy to pass by all HTTP requests"
debugMsg = "setting the HTTP/SOCKS proxy for all HTTP requests"
logger.debug(debugMsg)
proxySplit = urlparse.urlsplit(conf.proxy)
@@ -1376,7 +1376,7 @@ def _cleanupOptions():
if not any([char in conf.testFilter for char in ('.', ')', '(', ']', '[')]):
conf.testFilter = conf.testFilter.replace('*', '.*')
if conf.timeSec not in kb.explicitSettings:
if "timeSec" not in kb.explicitSettings:
if conf.tor:
conf.timeSec = 2 * conf.timeSec
kb.adjustTimeDelay = ADJUST_TIME_DELAY.DISABLE