Skip to content

Commit 10b671d

Browse files
committed
Update for an Issue sqlmapproject#182
1 parent 12d33c7 commit 10b671d

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

lib/request/basic.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,18 +180,19 @@ def decodePage(page, contentEncoding, contentType):
180180
return getUnicode(page)
181181

182182
if isinstance(contentEncoding, basestring) and contentEncoding.lower() in ("gzip", "x-gzip", "deflate"):
183-
if contentEncoding == "deflate":
184-
# http://stackoverflow.com/questions/1089662/python-inflate-and-deflate-implementations
185-
data = StringIO.StringIO(zlib.decompress(page, -15))
186-
else:
187-
data = gzip.GzipFile("", "rb", 9, StringIO.StringIO(page))
188-
189183
try:
184+
if contentEncoding == "deflate":
185+
# http://stackoverflow.com/questions/1089662/python-inflate-and-deflate-implementations
186+
data = StringIO.StringIO(zlib.decompress(page, -15))
187+
else:
188+
data = gzip.GzipFile("", "rb", 9, StringIO.StringIO(page))
189+
190190
page = data.read()
191191
except Exception, msg:
192192
errMsg = "detected invalid data for declared content "
193193
errMsg += "encoding '%s' ('%s')" % (contentEncoding, msg)
194194
singleTimeLogMessage(errMsg, logging.ERROR)
195+
return page
195196

196197
if not conf.charset:
197198
httpCharset, metaCharset = None, None

0 commit comments

Comments
 (0)