Merge branch 'master' of github.com:sqlmapproject/sqlmap

This commit is contained in:
Bernardo Damele 2012-12-14 13:40:36 +00:00
commit f52d81c834
3 changed files with 9 additions and 9 deletions

View File

@ -245,7 +245,7 @@ def decodePage(page, contentEncoding, contentType):
# e.g. ’…™
if "&#" in page:
page = re.sub('&#(\d+);', lambda _: unichr(int(_.group(1))), page)
# e.g. ζ
page = re.sub('&([^;]+);', lambda _: unichr(htmlEntities[_.group(1)]) if htmlEntities.get(_.group(1), 0) > 255 else _.group(0), page)

View File

@ -5,7 +5,7 @@ Copyright (c) 2006-2012 sqlmap developers (http://sqlmap.org/)
See the file 'doc/COPYING' for copying permission
"""
import argparse
import optparse
import os
import sys
import threading
@ -210,12 +210,12 @@ if __name__ == "__main__":
Standalone REST-JSON API wrapper function
"""
parser = argparse.ArgumentParser()
parser.add_argument("-s", "--server", help="Act as a REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store_true", required=False)
parser.add_argument("-c", "--client", help="Act as a REST-JSON API client", default=RESTAPI_SERVER_PORT, action="store_true", required=False)
parser.add_argument("-H", "--host", help="Host of the REST-JSON API server", default="0.0.0.0", action="store", required=False)
parser.add_argument("-p", "--port", help="Port of the the REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store", required=False)
args = parser.parse_args()
parser = optparse.OptionParser()
parser.add_option("-s", "--server", help="Act as a REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store_true")
parser.add_option("-c", "--client", help="Act as a REST-JSON API client", default=RESTAPI_SERVER_PORT, action="store_true")
parser.add_option("-H", "--host", help="Host of the REST-JSON API server", default="0.0.0.0", action="store")
parser.add_option("-p", "--port", help="Port of the the REST-JSON API server", default=RESTAPI_SERVER_PORT, action="store")
(args, _) = parser.parse_args()
if args.server is True:
restAPIrun(args.host, args.port)

View File

@ -83,7 +83,7 @@ def tamper(payload, **kwargs):
retVal += random.choice(blanks)
continue
retVal += payload[i]
return retVal