aboutsummaryrefslogtreecommitdiffstats
path: root/libmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-02-05 14:33:44 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-02-05 14:33:44 +0100
commit9a55cd733268ff66c19ff6fead18291ec8342d8c (patch)
tree9e9c3ad1e88f0e5a34a4a5b705c88b5a697ab7d2 /libmproxy
parentd864a326d25815a240aa5ac34171e48687311f29 (diff)
parent6d9b28f2ea07d61a856cf6fddf0bbe0b61e0bdb2 (diff)
downloadmitmproxy-9a55cd733268ff66c19ff6fead18291ec8342d8c.tar.gz
mitmproxy-9a55cd733268ff66c19ff6fead18291ec8342d8c.tar.bz2
mitmproxy-9a55cd733268ff66c19ff6fead18291ec8342d8c.zip
Merge branch 'master' into tcp_proxy
Diffstat (limited to 'libmproxy')
-rw-r--r--libmproxy/dump.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py
index 7b54f7c1..6cf5e688 100644
--- a/libmproxy/dump.py
+++ b/libmproxy/dump.py
@@ -223,8 +223,7 @@ class DumpMaster(flow.FlowMaster):
def run(self): # pragma: no cover
if self.o.rfile and not self.o.keepserving:
- for script in self.scripts:
- self.unload_script(script)
+ self.shutdown()
return
try:
return flow.FlowMaster.run(self)