Skip to content

Commit 779b352

Browse files
committed
Minor cosmetics
1 parent 9af2e68 commit 779b352

2 files changed

Lines changed: 12 additions & 5 deletions

File tree

lib/core/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
from thirdparty.six import unichr as _unichr
1919

2020
# sqlmap version (<major>.<minor>.<month>.<monthly commit>)
21-
VERSION = "1.5.1.10"
21+
VERSION = "1.5.1.11"
2222
TYPE = "dev" if VERSION.count('.') > 2 and VERSION.split('.')[-1] != '0' else "stable"
2323
TYPE_COLORS = {"dev": 33, "stable": 90, "pip": 34}
2424
VERSION_STRING = "sqlmap/%s#%s" % ('.'.join(VERSION.split('.')[:-1]) if VERSION.count('.') > 2 and VERSION.split('.')[-1] == '0' else VERSION, TYPE)

lib/request/connect.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,11 +193,18 @@ def _retryProxy(**kwargs):
193193
warnMsg += "(e.g. 'https://help.ubuntu.com/community/Tor')"
194194
else:
195195
warnMsg = "if the problem persists please check that the provided "
196-
warnMsg += "target URL is reachable. In case that it is, "
197-
warnMsg += "you can try to rerun with "
196+
warnMsg += "target URL is reachable"
197+
198+
items = []
198199
if not conf.randomAgent:
199-
warnMsg += "switch '--random-agent' and/or "
200-
warnMsg += "proxy switches ('--ignore-proxy', '--proxy',...)"
200+
items.append("switch '--random-agent'")
201+
if not any((conf.proxy, conf.proxyFile, conf.tor)):
202+
items.append("proxy switches ('--proxy', '--proxy-file'...)")
203+
if items:
204+
warnMsg += ". In case that it is, "
205+
warnMsg += "you can try to rerun with "
206+
warnMsg += " and/or ".join(items)
207+
201208
singleTimeWarnMessage(warnMsg)
202209

203210
elif conf.threads > 1:

0 commit comments

Comments
 (0)