Rooba
/
mitmproxy
mirror of https://github.com/mitmproxy/mitmproxy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1838 from mhils/http2-is-difficult 

Disable HTTP/2 by default, add explicit on/off switches
This commit is contained in:
Aldo Cortesi 2016-12-12 09:17:06 +13:00 committed by GitHub
parent a7d7ad2880 b24d9654a9
commit 6dcd620c4a
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
mitmproxy/tools/cmdline.py
View File

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