From cc9e70e3ccf1975099d6dc6e2d8a0f5b4b17a898 Mon Sep 17 00:00:00 2001
From: Thomas Kriechbaumer <thomas@kriechbaumer.name>
Date: Mon, 26 Dec 2016 21:51:10 +0100
Subject: enable HTTP/2 by default

---
 mitmproxy/tools/cmdline.py       | 5 ++---
 web/src/js/components/Footer.jsx | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/mitmproxy/tools/cmdline.py b/mitmproxy/tools/cmdline.py
index a8f04f8d..d0b53b2c 100644
--- a/mitmproxy/tools/cmdline.py
+++ b/mitmproxy/tools/cmdline.py
@@ -453,12 +453,11 @@ def proxy_options(parser):
     )
 
     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."
+                            "Enabled by default."
                        )
+    http2.add_argument("--http2", action="store_true", dest="http2")
 
     websocket = group.add_mutually_exclusive_group()
     websocket.add_argument("--no-websocket", action="store_false", dest="websocket",
diff --git a/web/src/js/components/Footer.jsx b/web/src/js/components/Footer.jsx
index ee26dad2..7c7e7770 100644
--- a/web/src/js/components/Footer.jsx
+++ b/web/src/js/components/Footer.jsx
@@ -26,8 +26,8 @@ function Footer({ settings }) {
             {rawtcp && (
                 <span className="label label-success">raw-tcp</span>
             )}
-            {http2 && (
-                <span className="label label-success">http2</span>
+            {!http2 && (
+                <span className="label label-success">no-http2</span>
             )}
             {!websocket && (
                 <span className="label label-success">no-websocket</span>
-- 
cgit v1.2.3