diff --git a/lib/core/option.py b/lib/core/option.py index 3fdd10c40..6500bed8c 100644 --- a/lib/core/option.py +++ b/lib/core/option.py @@ -2652,7 +2652,7 @@ def _mergeOptions(inputOptions, overrideOptions): inputOptionsItems = inputOptions.__dict__.items() for key, value in inputOptionsItems: - if key not in conf or value not in (None, False) or overrideOptions: + if key not in conf or (value is not None and value is not False) or overrideOptions: # Note: explicit zero (e.g. '--delay 0') has to win over the configuration file conf[key] = value if not conf.api: diff --git a/lib/core/settings.py b/lib/core/settings.py index 0d94c655b..7caa61073 100644 --- a/lib/core/settings.py +++ b/lib/core/settings.py @@ -19,7 +19,7 @@ from lib.core.enums import OS from thirdparty import six # sqlmap version (...) -VERSION = "1.10.11.46" +VERSION = "1.10.11.47" 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)