Merge branch 'master' into demo

This commit is contained in:
ziirish 2016-01-07 23:04:10 +01:00
commit 8cfc1a21f5
2 changed files with 4 additions and 4 deletions

View file

@ -120,9 +120,9 @@ class BUIAgent(BUIbackend):
self.cli = BurpHandler(self.vers, self.logger, self.conf)
if not self.ssl:
self.sslkey = None
self.sslcert = None
self.server = StreamServer((self.bind, self.port), self.handle, keyfile=self.sslkey, certfile=self.sslcert)
self.server = StreamServer((self.bind, self.port), self.handle)
else:
self.server = StreamServer((self.bind, self.port), self.handle, keyfile=self.sslkey, certfile=self.sslcert)
def run(self):
try:

View file

@ -18,7 +18,7 @@ progress_counter = 1
# Ratelimit throttles the send speed. Specified in Megabits per second (Mb/s).
# ratelimit = 1.5
# Network timeout defaults to 7200 seconds (2 hours).
network_timeout = 0
network_timeout = 72000
# The directory to which autoupgrade files will be downloaded.
# To never autoupgrade, leave it commented out.
# autoupgrade_dir=/opt/burp2/etc/autoupgrade/client