diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:31 +0100 |
|---|---|---|
| committer | Maximilian Hils <git@maximilianhils.com> | 2013-12-08 14:14:31 +0100 |
| commit | e3c69fd105f925009fdf31efe8598f70e2950ab4 (patch) | |
| tree | b61bb99ae8e34f73583263619730fbbe5d526161 /libmproxy/dump.py | |
| parent | 948d4c0445f006640d08d96dc3d6e604df78bc99 (diff) | |
| parent | 3a1d85ab18dbff82505feac3619af733a0a2b4f7 (diff) | |
| download | mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.tar.gz mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.tar.bz2 mitmproxy-e3c69fd105f925009fdf31efe8598f70e2950ab4.zip | |
Merge remote-tracking branch 'origin/master'
Diffstat (limited to 'libmproxy/dump.py')
| -rw-r--r-- | libmproxy/dump.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libmproxy/dump.py b/libmproxy/dump.py index 7a49cee0..12488937 100644 --- a/libmproxy/dump.py +++ b/libmproxy/dump.py @@ -24,7 +24,7 @@ class Options(object): "rheaders", "setheaders", "server_replay", - "script", + "scripts", "showhost", "stickycookie", "stickyauth", @@ -109,8 +109,8 @@ class DumpMaster(flow.FlowMaster): not options.keepserving ) - if options.script: - err = self.load_script(options.script) + for script_argv in options.scripts: + err = self.load_script(script_argv) if err: raise DumpError(err) @@ -221,8 +221,8 @@ class DumpMaster(flow.FlowMaster): def run(self): # pragma: no cover if self.o.rfile and not self.o.keepserving: - if self.script: - self.load_script(None) + for script in self.scripts: + self.unload_script(script) return try: return flow.FlowMaster.run(self) |