From 3e4130c5e6e2255f8b0e81d82ae2283d52f439f9 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Mon, 28 Aug 2017 11:08:36 +0200
Subject: [PATCH] Update for #2665

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

diff --git a/lib/core/settings.py b/lib/core/settings.py
index 6cafcca90..f13751c01 100755
--- 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.8.12"
+VERSION = "1.1.8.13"
 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/lib/request/connect.py b/lib/request/connect.py
index 0b32ce135..28ffef264 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -543,12 +543,11 @@ class Connect(object):
                     logger.warn(warnMsg)
 
         except SqlmapConnectionException, ex:
-            if conf.proxyList:
+            if conf.proxyList and not kb.threadException:
                 warnMsg = "unable to connect to the target URL ('%s')" % ex
-                if threadData.retriesCount < conf.retries and not kb.threadException:
-                    warnMsg += ". sqlmap is going to retry the request"
-                    logger.critical(warnMsg)
-                    return Connect._retryProxy(**kwargs)
+                logger.critical(warnMsg)
+                threadData.retriesCount = conf.retries
+                return Connect._retryProxy(**kwargs)
             else:
                 raise
 
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index dd0fddf8e..77674a732 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -46,7 +46,7 @@ a44d7a4cc6c9a67a72d6af2f25f4ddac  lib/core/exception.py
 d8e9250f3775119df07e9070eddccd16  lib/core/replication.py
 785f86e3f963fa3798f84286a4e83ff2  lib/core/revision.py
 40c80b28b3a5819b737a5a17d4565ae9  lib/core/session.py
-b1572cb13eca4ff0900904cabdc432e7  lib/core/settings.py
+5ad722bb1b3296fb62948866e662bfd1  lib/core/settings.py
 d91291997d2bd2f6028aaf371bf1d3b6  lib/core/shell.py
 2ad85c130cc5f2b3701ea85c2f6bbf20  lib/core/subprocessng.py
 4a6ecdd8a6e44bb4737bd9bc7f9b5743  lib/core/target.py
@@ -68,7 +68,7 @@ ad74fc58fc7214802fd27067bce18dd2  lib/core/unescaper.py
 403d873f1d2fd0c7f73d83f104e41850  lib/request/basicauthhandler.py
 a06eddbdb529d4253c57250decb8e960  lib/request/basic.py
 ef48de622b0a6b4a71df64b0d2785ef8  lib/request/comparison.py
-92594f00f92d1e9eafa572cc09527b2e  lib/request/connect.py
+55abbdc8f6904a4e096c51fe68982a11  lib/request/connect.py
 fb6b788d0016ab4ec5e5f661f0f702ad  lib/request/direct.py
 cc1163d38e9b7ee5db2adac6784c02bb  lib/request/dns.py
 5dcdb37823a0b5eff65cd1018bcf09e4  lib/request/httpshandler.py