aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/dump.py1
-rw-r--r--libmproxy/proxy.py2
2 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index 21ea038e..d1bdfb3f 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -187,7 +187,6 @@ class DumpMaster(flow.FlowMaster):
def handle_error(self, msg):
f = flow.FlowMaster.handle_error(self, msg)
if f:
- msg._ack()
self._process_flow(f)
return f
diff --git a/libmproxy/proxy.py b/libmproxy/proxy.py
index 0ef5e225..54becb39 100644
--- a/libmproxy/proxy.py
+++ b/libmproxy/proxy.py
@@ -22,7 +22,7 @@ class ProxyError(Exception):
class SSLConfig:
- def __init__(self, certfile = None, ciphers = None, cacert = None, cert_wait_time=None):
+ def __init__(self, certfile = None, ciphers = None, cacert = None, cert_wait_time=0):
self.certfile = certfile
self.ciphers = ciphers
self.cacert = cacert