From c293a6a25af925fb90cc67f1904e420e5fe513f5 Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Sat, 15 Oct 2016 09:53:12 +0200
Subject: [PATCH] Fixes #2229 and #2230

---
 lib/core/settings.py      | 2 +-
 thirdparty/socks/socks.py | 6 ++++++
 txt/checksum.md5          | 4 ++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/core/settings.py b/lib/core/settings.py
index c1fd8ca66..32865dcd9 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.0.10.37"
+VERSION = "1.0.10.38"
 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/thirdparty/socks/socks.py b/thirdparty/socks/socks.py
index dfe879ab4..7301e236a 100644
--- a/thirdparty/socks/socks.py
+++ b/thirdparty/socks/socks.py
@@ -70,6 +70,7 @@ PROXY_TYPES = {"SOCKS4": SOCKS4, "SOCKS5": SOCKS5, "HTTP": HTTP}
 PRINTABLE_PROXY_TYPES = dict(zip(PROXY_TYPES.values(), PROXY_TYPES.keys()))
 
 _orgsocket = _orig_socket = socket.socket
+_orgcreateconnection = socket.create_connection
 
 class ProxyError(IOError):
     """
@@ -145,7 +146,12 @@ def wrap_module(module):
     else:
         raise GeneralProxyError("No default proxy specified")
 
+def unwrap_module(module):
+    module.socket.socket = _orgsocket
+    module.socket.create_connection = _orgcreateconnection
+
 wrapmodule = wrap_module
+unwrapmodule = unwrap_module
 
 def create_connection(dest_pair, proxy_type=None, proxy_addr=None,
                       proxy_port=None, proxy_rdns=True,
diff --git a/txt/checksum.md5 b/txt/checksum.md5
index 67587a313..36e87b843 100644
--- a/txt/checksum.md5
+++ b/txt/checksum.md5
@@ -45,7 +45,7 @@ e60456db5380840a586654344003d4e6  lib/core/readlineng.py
 5ef56abb8671c2ca6ceecb208258e360  lib/core/replication.py
 99a2b496b9d5b546b335653ca801153f  lib/core/revision.py
 7c15dd2777af4dac2c89cab6df17462e  lib/core/session.py
-ecc7bdb84caadf1435a3f21b4cf19ef3  lib/core/settings.py
+d4200890061c99da6b976755b4aebd83  lib/core/settings.py
 7af83e4f18cab6dff5e67840eb65be80  lib/core/shell.py
 23657cd7d924e3c6d225719865855827  lib/core/subprocessng.py
 c3ace7874a536d801f308cf1fd03df99  lib/core/target.py
@@ -349,7 +349,7 @@ ff80a22ee858f5331b0c088efa98b3ff  thirdparty/prettyprint/prettyprint.py
 5c70f8e5f7353aedc6d8d21d4fb72b37  thirdparty/pydes/__init__.py
 a7f735641c5b695f3d6220fe7c91b030  thirdparty/pydes/pyDes.py
 d41d8cd98f00b204e9800998ecf8427e  thirdparty/socks/__init__.py
-7cb5df774288a8d835494c8a72435cc0  thirdparty/socks/socks.py
+a2f0ee74ccc895150f310ef8d680edca  thirdparty/socks/socks.py
 d41d8cd98f00b204e9800998ecf8427e  thirdparty/termcolor/__init__.py
 ea649aae139d8551af513769dd913dbf  thirdparty/termcolor/termcolor.py
 855372c870a23d46683f8aa39d75f6a1  thirdparty/xdot/__init__.py