[pull] master from sqlmapproject:master

data/txt/sha256sums.txt

@@ -165,7 +165,7 @@ eed1db5da17eca4c65a8f999166e2246eef84397687ae820bbe4984ef65a09df  extra/vulnserv
 49bcd74281297c79a6ae5d4b0d1479ddace4476fddaf4383ca682a6977b553e3  lib/controller/handler.py
 4608f21a4333c162ab3c266c903fda4793cc5834de30d06affe9b7566dd09811  lib/controller/__init__.py
 ac44a343947162532dbf17bd1f9ab424f8008f677367c5ad3f9f7b715a679818  lib/core/agent.py
-c9cba7319fa56f65f9eaff27e31c251cd36e9b85b17003b88a8af0ea7da8c933  lib/core/bigarray.py
+86a9cb82c7e7beb4730264dae20bf3b7cd87c0dcaee587367362cf319f7bb079  lib/core/bigarray.py
 f6062e324fdeaacf9df0a289fc3f12f755143e3876a70cb65b38aa2e690f73c1  lib/core/common.py
 11c748cc96ea2bc507bc6c1930a17fe4bc6fdd2dd2a80430df971cb21428eb00  lib/core/compat.py
 39ea62d4224be860befeffb3843c150f2343b64555ad8c438a400222056f6cc0  lib/core/convert.py
@@ -188,7 +188,7 @@ c4bfb493a03caf84dd362aec7c248097841de804b7413d0e1ecb8a90c8550bc0  lib/core/readl
 d1bd70c1a55858495c727fbec91e30af267459c8f64d50fabf9e4ee2c007e920  lib/core/replication.py
 1d0f80b0193ac5204527bfab4bde1a7aee0f693fd008e86b4b29f606d1ef94f3  lib/core/revision.py
 d2eb8e4b05ac93551272b3d4abfaf5b9f2d3ac92499a7704c16ed0b4f200db38  lib/core/session.py
-daadf9a51c1d224f225a372a29b263484e0982f8e91eec1ccc601911c8906514  lib/core/settings.py
+c42265c888448e115be0ea6ba6fdc86c86cbd00cdbc3a635c21b2a06949920d6  lib/core/settings.py
 1c5eab9494eb969bc9ce118a2ea6954690c6851cbe54c18373c723b99734bf09  lib/core/shell.py
 4eea6dcf023e41e3c64b210cb5c2efc7ca893b727f5e49d9c924f076bb224053  lib/core/subprocessng.py
 cdd352e1331c6b535e780f6edea79465cb55af53aa2114dcea0e8bf382e56d1a  lib/core/target.py

lib/core/bigarray.py

@@ -66,7 +66,7 @@ class BigArray(list):
     """
     List-like class used for storing large amounts of data (disk cached)
 
-    >>> _ = BigArray(xrange(100000))
+    >>> _ = BigArray(xrange(100000), chunk_size=500 * 1024)
     >>> _[20] = 0
     >>> _[-1] = 999
     >>> _[99999]
@@ -97,14 +97,15 @@ class BigArray(list):
     100000
     """
 
-    def __init__(self, items=None):
+    def __init__(self, items=None, chunk_size=BIGARRAY_CHUNK_SIZE):
         self.chunks = [[]]
         self.chunk_length = sys.maxsize
         self.cache = None
         self.filenames = set()
         self._lock = threading.Lock()
         self._os_remove = os.remove
         self._size_counter = 0
+        self._chunk_size = chunk_size
 
         for item in (items or []):
             self.append(item)
@@ -129,7 +130,7 @@ def append(self, value):
 
             if self.chunk_length == sys.maxsize:
                 self._size_counter += _size_of(value)
-                if self._size_counter >= BIGARRAY_CHUNK_SIZE:
+                if self._size_counter >= self._chunk_size:
                     self.chunk_length = len(self.chunks[-1])
                     self._size_counter = None
 

lib/core/settings.py

@@ -19,7 +19,7 @@
 from thirdparty import six
 
 # sqlmap version (<major>.<minor>.<month>.<monthly commit>)
-VERSION = "1.9.12.31"
+VERSION = "1.9.12.32"
 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)
@@ -655,7 +655,7 @@
 ROTATING_CHARS = ('\\', '|', '|', '/', '-')
 
 # Approximate chunk length (in bytes) used by BigArray objects (only last chunk and cached one are held in memory)
-BIGARRAY_CHUNK_SIZE = 1024 * 1024
+BIGARRAY_CHUNK_SIZE = 32 * 1024 * 1024
 
 # Compress level used for storing BigArray chunks to disk (0-9)
 BIGARRAY_COMPRESS_LEVEL = 4