From 85b73f872e49b6edc0007ac6d780304775316de1 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Thu, 20 Aug 2020 13:54:52 +0200
Subject: [PATCH] Minor patch

---
 data/xml/errors.xml      | 2 +-
 lib/controller/checks.py | 2 +-
 lib/core/settings.py     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/xml/errors.xml b/data/xml/errors.xml
index e7aa190b1..568b61bbe 100644
--- a/data/xml/errors.xml
+++ b/data/xml/errors.xml
@@ -83,7 +83,7 @@
         <error regexp="CLI Driver.*?DB2"/>
         <error regexp="DB2 SQL error"/>
         <error regexp="\bdb2_\w+\("/>
-        <error regexp="SQLSTATE.+SQLCODE"/>
+        <error regexp="SQLCODE[=:\d, -]+SQLSTATE"/>
         <error regexp="com\.ibm\.db2\.jcc"/>
         <error regexp="Zend_Db_(Adapter|Statement)_Db2_Exception"/>
         <error regexp="Pdo[./_\\]Ibm"/>
diff --git a/lib/controller/checks.py b/lib/controller/checks.py
index 919859fed..24d8d70d1 100644
--- a/lib/controller/checks.py
+++ b/lib/controller/checks.py
@@ -1581,7 +1581,7 @@ def checkConnection(suppressOutput=False):
         kb.originalPage = kb.pageTemplate = threadData.lastPage
         kb.originalCode = threadData.lastCode
 
-    if conf.cj and not conf.cookie and not conf.dropSetCookie:
+    if conf.cj and not conf.cookie and not any(_[0] == HTTP_HEADER.COOKIE for _ in conf.httpHeaders) and not conf.dropSetCookie:
         candidate = DEFAULT_COOKIE_DELIMITER.join("%s=%s" % (_.name, _.value) for _ in conf.cj)
 
         message = "you have not declared cookie(s), while "
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 287c22772..8b9a05cd4 100644
--- a/lib/core/settings.py
+++ b/lib/core/settings.py
@@ -18,7 +18,7 @@ from lib.core.enums import OS
 from thirdparty.six import unichr as _unichr
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.4.8.10"
+VERSION = "1.4.8.11"
 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)