aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy
diff options
context:
space:
mode:
authorMaximilian Hils <git@maximilianhils.com>2018-02-25 16:52:34 +0100
committerGitHub <noreply@github.com>2018-02-25 16:52:34 +0100
commita9b8d85e99936aec370c79fdce3f10547a353199 (patch)
tree79fad6c6cb5981d58b1d9003b3c61507d4793635 /mitmproxy
parent154309b81113695c43e8cc157fe1ec25bc44823f (diff)
parent13a47c66bfa720f9ca454d6dc2d1085e2be0754d (diff)
downloadmitmproxy-a9b8d85e99936aec370c79fdce3f10547a353199.tar.gz
mitmproxy-a9b8d85e99936aec370c79fdce3f10547a353199.tar.bz2
mitmproxy-a9b8d85e99936aec370c79fdce3f10547a353199.zip
Merge pull request #2919 from fristonio/Fix-2906
Fix --socks option deprecated info in command line args check.
Diffstat (limited to 'mitmproxy')
-rw-r--r--mitmproxy/utils/arg_check.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/mitmproxy/utils/arg_check.py b/mitmproxy/utils/arg_check.py
index 873bef06..9c582c4c 100644
--- a/mitmproxy/utils/arg_check.py
+++ b/mitmproxy/utils/arg_check.py
@@ -11,7 +11,6 @@ DEPRECATED = """
--order
--no-mouse
--reverse
---socks
--http2-priority
--no-http2-priority
--no-websocket
@@ -59,6 +58,7 @@ REPLACED = """
-i
-f
--filter
+--socks
"""
REPLACEMENTS = {
@@ -99,7 +99,8 @@ REPLACEMENTS = {
"--replace": "--replacements",
"-i": "--intercept",
"-f": "--view-filter",
- "--filter": "--view-filter"
+ "--filter": "--view-filter",
+ "--socks": "--mode socks5"
}