disable http2 by default, add explicit on/off switches

As long as major HTTP/2 implementers fail to implement the spec correctly,
we need to disable HTTP/2 by default. We expect this to be fixed with
the next release and re-enabled by default.

https://github.com/mitmproxy/mitmproxy/issues/1745
https://github.com/mitmproxy/mitmproxy/issues/1824
This commit is contained in:
Maximilian Hils 2016-12-11 00:26:01 +01:00
parent 8112bce424
commit b24d9654a9
1 changed files with 15 additions and 13 deletions

View File

@ -451,19 +451,21 @@ def proxy_options(parser):
action="store", type=int, dest="port", action="store", type=int, dest="port",
help="Proxy service port." help="Proxy service port."
) )
group.add_argument(
"--no-http2", http2 = group.add_mutually_exclusive_group()
action="store_false", dest="http2", http2.add_argument("--http2", action="store_true", dest="http2")
help=""" http2.add_argument("--no-http2", action="store_false", dest="http2",
Explicitly disable HTTP/2 support. help="Explicitly enable/disable HTTP/2 support. "
If your OpenSSL version supports ALPN, HTTP/2 is enabled by default. "Disabled by default until major websites implement the spec correctly. "
""" "Default value will change in a future version."
) )
group.add_argument(
"--no-websocket", websocket = group.add_mutually_exclusive_group()
action="store_false", dest="websocket", websocket.add_argument("--no-websocket", action="store_false", dest="websocket",
help="Explicitly disable WebSocket support." help="Explicitly enable/disable WebSocket support. "
"Enabled by default."
) )
websocket.add_argument("--websocket", action="store_true", dest="websocket")
parser.add_argument( parser.add_argument(
"--upstream-auth", "--upstream-auth",