From a651c8a637362218883a3508dc5ae38ba1b8797d Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 15 Nov 2017 10:36:32 +0100
Subject: [PATCH] Fixes #2779

---
 lib/core/settings.py |  2 +-
 sqlmap.py            | 11 +++++------
 txt/checksum.md5     |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 4f8ff78d7..8e27b64b1 100644
--- 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 (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.1.11.20"
+VERSION = "1.1.11.21"
 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/sqlmap.py b/sqlmap.py
index d307f77d4..e70a17efd 100755
--- a/sqlmap.py
+++ b/sqlmap.py
@@ -138,21 +138,20 @@ def main():
         dataToStdout("[!] legal disclaimer: %s\n\n" % LEGAL_DISCLAIMER, forceOutput=True)
         dataToStdout("[*] starting at %s\n\n" % time.strftime("%X"), forceOutput=True)
 
-        # Delayed imports (33% of all imports)
-        from lib.controller.controller import start
-        from lib.core.profiling import profile
-        from lib.core.testing import smokeTest
-        from lib.core.testing import liveTest
-
         init()
 
+        # Postponed imports (faster start)
         if conf.profile:
+            from lib.core.profiling import profile
             profile()
         elif conf.smokeTest:
+            from lib.core.testing import smokeTest
             smokeTest()
         elif conf.liveTest:
+            from lib.core.testing import liveTest
             liveTest()
         else:
+            from lib.controller.controller import start
             try:
                 start()
             except thread.error as ex:
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index b9f44f845..ddc1d6f73 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -46,7 +46,7 @@ e1c000db9be27f973569b1a430629037  lib/core/option.py
 760d9df2a27ded29109b390ab202e72d  lib/core/replication.py
 a2466b62e67f8b31736bac4dac590e51  lib/core/revision.py
 02d4762140a72fd44668d3dab5eabda9  lib/core/session.py
-00c57f5e38a9d7b5668f5ae247880246  lib/core/settings.py
+915cf4eeb4fefcb6ebb8c10cd3c50468  lib/core/settings.py
 35bffbad762eb9e03db9e93b1c991103  lib/core/shell.py
 a59ec28371ae067a6fdd8f810edbee3d  lib/core/subprocessng.py
 d5a04d672a18f78deb2839c3745ff83c  lib/core/target.py
@@ -224,7 +224,7 @@ c3cc8b7727161e64ab59f312c33b541a  shell/stager.aspx_
 1f7f125f30e0e800beb21e2ebbab18e1  shell/stager.jsp_
 01e3505e796edf19aad6a996101c81c9  shell/stager.php_
 c737efc0afe782c5dcfec9d27e827515  sqlmapapi.py
-8f34280b975a35f68d5fba0123786871  sqlmap.py
+5055a9d152e379fd7d55cbbf06025834  sqlmap.py
 ba9bb7b0fbfbd408c24bc99b3c8f0fd9  tamper/apostrophemask.py
 aa046ea026a3c72b714e726a2e775cd4  tamper/apostrophenullencode.py
 0418d808878bf7cac4a28350116e64d0  tamper/appendnullbyte.py