From 241f7321de78d4c49bca0255b004c7d42621d2d6 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Mon, 26 Mar 2018 15:39:48 +0200
Subject: [PATCH] Proper patch related to the #3009

---
 lib/core/option.py     | 2 +-
 lib/core/settings.py   | 2 +-
 lib/request/basic.py   | 2 +-
 lib/request/connect.py | 2 +-
 txt/checksum.md5       | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/core/option.py b/lib/core/option.py
index 902f702b4..63582f5d9 100644
--- a/lib/core/option.py
+++ b/lib/core/option.py
@@ -2359,7 +2359,7 @@ def _checkTor():
     logger.info(infoMsg)
 
     try:
-        page, _, _ = Request.getPage(url="https://check.torproject.org/", referer=None, raise404=False)
+        page, _, _ = Request.getPage(url="https://check.torproject.org/", raise404=False)
     except SqlmapConnectionException:
         page = None
 
diff --git a/lib/core/settings.py b/lib/core/settings.py
index 76fc6700c..0ff4f01f6 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.2.3.43"
+VERSION = "1.2.3.44"
 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/basic.py b/lib/request/basic.py
index 14e461946..6e82b2da1 100644
--- a/lib/request/basic.py
+++ b/lib/request/basic.py
@@ -61,7 +61,7 @@ def forgeHeaders(items=None, base=None):
         if items[_] is None:
             del items[_]
 
-    headers = OrderedDict(base or conf.httpHeaders)
+    headers = OrderedDict(conf.httpHeaders if base is None else base)
     headers.update(items.items())
 
     class _str(str):
diff --git a/lib/request/connect.py b/lib/request/connect.py
index df045c3cf..dc2714bf2 100644
--- a/lib/request/connect.py
+++ b/lib/request/connect.py
@@ -346,7 +346,7 @@ class Connect(object):
             requestMsg += " %s" % httplib.HTTPConnection._http_vsn_str
 
             # Prepare HTTP headers
-            headers = forgeHeaders({HTTP_HEADER.COOKIE: cookie, HTTP_HEADER.USER_AGENT: ua, HTTP_HEADER.REFERER: referer, HTTP_HEADER.HOST: host})
+            headers = forgeHeaders({HTTP_HEADER.COOKIE: cookie, HTTP_HEADER.USER_AGENT: ua, HTTP_HEADER.REFERER: referer, HTTP_HEADER.HOST: host}, base=None if target else {})
 
             if HTTP_HEADER.COOKIE in headers:
                 cookie = headers[HTTP_HEADER.COOKIE]
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index b056b99ec..9534c76a4 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -40,13 +40,13 @@ cada93357a7321655927fc9625b3bfec  lib/core/exception.py
 1e5532ede194ac9c083891c2f02bca93  lib/core/__init__.py
 458a194764805cd8312c14ecd4be4d1e  lib/core/log.py
 c9a56e58984420a5abb7a3f7aadc196d  lib/core/optiondict.py
-838f38559c01a690cc04620cb15692ab  lib/core/option.py
+b7c3e98e5400d73e9ce5c1a30145f7c6  lib/core/option.py
 7cfd04e583cca782b843f6f6d973981a  lib/core/profiling.py
 ffa5f01f39b17c8d73423acca6cfe86a  lib/core/readlineng.py
 0c3eef46bdbf87e29a3f95f90240d192  lib/core/replication.py
 a7db43859b61569b601b97f187dd31c5  lib/core/revision.py
 fcb74fcc9577523524659ec49e2e964b  lib/core/session.py
-d909ef19b43548c3e7eb332c0ee495b0  lib/core/settings.py
+3f186f4f5322acd57c659532090d11ba  lib/core/settings.py
 0dfc2ed40adf72e302291f6ecd4406f6  lib/core/shell.py
 a7edc9250d13af36ac0108f259859c19  lib/core/subprocessng.py
 a35efa7bec9f1e6cedf17c9830a79241  lib/core/target.py
@@ -66,9 +66,9 @@ fb2e2f05dde98caeac6ccf3e67192177  lib/parse/configfile.py
 ec4e56bbb1349176b2a22e0b99ba6a55  lib/parse/payloads.py
 492654567e72b6a14584651fcd9f16e6  lib/parse/sitemap.py
 30eed3a92a04ed2c29770e1b10d39dc0  lib/request/basicauthhandler.py
-53c38db67dd4b14fbceee71e4748f874  lib/request/basic.py
+7e8e0a3fdebbe443832c1bab2f8d3869  lib/request/basic.py
 c0cabedead14b8a23353b606672cff42  lib/request/comparison.py
-bf97dd285be3cc341233a9f4e09137f8  lib/request/connect.py
+a42707d6e89312659d3bdc8fb4ad1336  lib/request/connect.py
 dd4598675027fae99f2e2475b05986da  lib/request/direct.py
 2044fce3f4ffa268fcfaaf63241b1e64  lib/request/dns.py
 eee965d781546d05f36cfd14af050913  lib/request/httpshandler.py