aboutsummaryrefslogtreecommitdiffstats
path: root/mitmproxy/cmdline.py
diff options
context:
space:
mode:
Diffstat (limited to 'mitmproxy/cmdline.py')
-rw-r--r--mitmproxy/cmdline.py20
1 files changed, 8 insertions, 12 deletions
diff --git a/mitmproxy/cmdline.py b/mitmproxy/cmdline.py
index fedd4f13..3e9fa011 100644
--- a/mitmproxy/cmdline.py
+++ b/mitmproxy/cmdline.py
@@ -362,18 +362,14 @@ def proxy_options(parser):
action="store", type=int, dest="port", default=8080,
help="Proxy service port."
)
- http2 = group.add_mutually_exclusive_group()
- # !!!
- # Watch out: We raise a RuntimeError in mitmproxy.proxy.config if http2 is enabled,
- # but the OpenSSL version does not have ALPN support (which is the default on Ubuntu 14.04).
- # Do not simply set --http2 as enabled by default.
- # !!!
- http2.add_argument("--http2", action="store_true", dest="http2")
- http2.add_argument("--no-http2", action="store_false", dest="http2",
- help="Explicitly enable/disable experimental HTTP2 support. "
- "Disabled by default. "
- "Default value will change in a future version."
- )
+ group.add_argument(
+ "--no-http2",
+ action="store_false", dest="http2",
+ help="""
+ Explicitly disable HTTP/2 support.
+ If your OpenSSL version supports ALPN, HTTP/2 is enabled by default.
+ """
+ )
rawtcp = group.add_mutually_exclusive_group()
rawtcp.add_argument("--raw-tcp", action="store_true", dest="rawtcp")
rawtcp.add_argument("--no-raw-tcp", action="store_false", dest="rawtcp",