diff options
| author | Aldo Cortesi <aldo@corte.si> | 2018-05-10 17:30:49 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-10 17:30:49 +1200 |
| commit | ab89079c65272a9a2ef4f98d38d0ed39468bc876 (patch) | |
| tree | 340375b07b4ce7de5e4b4c2d0c98fa4d18edee21 /mitmproxy/utils/arg_check.py | |
| parent | 0c101a4bccfb8460a11691cc17467d47d1974b2f (diff) | |
| parent | 8c63a8818d6e66c5b1e32e30d785d8d4a3bc233c (diff) | |
| download | mitmproxy-ab89079c65272a9a2ef4f98d38d0ed39468bc876.tar.gz mitmproxy-ab89079c65272a9a2ef4f98d38d0ed39468bc876.tar.bz2 mitmproxy-ab89079c65272a9a2ef4f98d38d0ed39468bc876.zip | |
Merge pull request #3109 from cortesi/kmap
console keybindings: define a yaml format, load CONFDIR/keys.yaml on startup
Diffstat (limited to 'mitmproxy/utils/arg_check.py')
| -rw-r--r-- | mitmproxy/utils/arg_check.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mitmproxy/utils/arg_check.py b/mitmproxy/utils/arg_check.py index 9c582c4c..123ae265 100644 --- a/mitmproxy/utils/arg_check.py +++ b/mitmproxy/utils/arg_check.py @@ -1,7 +1,7 @@ import sys DEPRECATED = """ ---cadir +--confdir -Z --body-size-limit --stream @@ -22,7 +22,7 @@ DEPRECATED = """ --client-certs --no-upstream-cert --add-upstream-certs-to-client-chain ---upstream-trusted-cadir +--upstream-trusted-confdir --upstream-trusted-ca --ssl-version-client --ssl-version-server @@ -72,7 +72,7 @@ REPLACEMENTS = { "--no-http2-priority": "http2_priority", "--no-websocket": "websocket", "--no-upstream-cert": "upstream_cert", - "--upstream-trusted-cadir": "ssl_verify_upstream_trusted_cadir", + "--upstream-trusted-confdir": "ssl_verify_upstream_trusted_confdir", "--upstream-trusted-ca": "ssl_verify_upstream_trusted_ca", "--no-onboarding": "onboarding", "--no-pop": "server_replay_nopop", |