aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2014-11-28 19:48:26 +0100
committerMaximilian Hils <git@maximilianhils.com>2014-11-28 19:48:26 +0100
commit38621f2d49632a25908f0f80ad73c4c5d81fa56a (patch)
tree7b7ea02071dac0f75be4e344a1f863536a154d0e
parent56f1278d1a0233620289d2fa4173449ed108a73e (diff)
parentcf7404cfe0579483e2478c816ca883048ad1ece1 (diff)
downloadmitmproxy-38621f2d49632a25908f0f80ad73c4c5d81fa56a.tar.gz
mitmproxy-38621f2d49632a25908f0f80ad73c4c5d81fa56a.tar.bz2
mitmproxy-38621f2d49632a25908f0f80ad73c4c5d81fa56a.zip
Merge pull request #415 from gabe-k/flowbasic-fix
Changed argument name from confdir to cadir in flowbasic example
-rwxr-xr-xexamples/flowbasic2
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/flowbasic b/examples/flowbasic
index 41402b0c..c71debc9 100755
--- a/examples/flowbasic
+++ b/examples/flowbasic
@@ -36,7 +36,7 @@ class MyMaster(flow.FlowMaster):
config = proxy.ProxyConfig(
port=8080,
- confdir="~/.mitmproxy/" # use ~/.mitmproxy/mitmproxy-ca.pem as default CA file.
+ cadir="~/.mitmproxy/" # use ~/.mitmproxy/mitmproxy-ca.pem as default CA file.
)
state = flow.State()
server = ProxyServer(config)