diff options
| author | Maximilian Hils <git@maximilianhils.com> | 2017-04-26 13:40:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-26 13:40:51 +0200 |
| commit | d5ea08db6244e4957f9134a4313a90d3efb8dde9 (patch) | |
| tree | 14069d73669933f6f5341ab885e6ad7091c5dd67 /mitmproxy/tools/web/master.py | |
| parent | 0a8e54edeab4c1a250333874129dfb2360d27af3 (diff) | |
| parent | ca2827886a97de88f4ab2937e71588fc9320ba4d (diff) | |
| download | mitmproxy-d5ea08db6244e4957f9134a4313a90d3efb8dde9.tar.gz mitmproxy-d5ea08db6244e4957f9134a4313a90d3efb8dde9.tar.bz2 mitmproxy-d5ea08db6244e4957f9134a4313a90d3efb8dde9.zip | |
Merge pull request #2258 from mhils/readfile
Integrate readstdin into readfile
Diffstat (limited to 'mitmproxy/tools/web/master.py')
| -rw-r--r-- | mitmproxy/tools/web/master.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mitmproxy/tools/web/master.py b/mitmproxy/tools/web/master.py index 0db5a09f..c09fe0a2 100644 --- a/mitmproxy/tools/web/master.py +++ b/mitmproxy/tools/web/master.py @@ -7,6 +7,7 @@ from mitmproxy import log from mitmproxy import master from mitmproxy.addons import eventstore from mitmproxy.addons import intercept +from mitmproxy.addons import readfile from mitmproxy.addons import termlog from mitmproxy.addons import view from mitmproxy.addons import termstatus @@ -32,6 +33,7 @@ class WebMaster(master.Master): self.addons.add(*addons.default_addons()) self.addons.add( intercept.Intercept(), + readfile.ReadFile(), self.view, self.events, ) |