From ead21d218f62695b520d779007c058edb289ebb6 Mon Sep 17 00:00:00 2001
From: Bryan Call <bcall@apache.org>
Date: Tue, 26 Jul 2016 16:14:22 +0200
Subject: [PATCH] TS-3620: Enable HTTP/2 by default

---
 ci/tsqa/tests/test_http2.py                 |  1 -
 ci/tsqa/tests/test_http2_spec.py            |  1 -
 doc/admin-guide/files/records.config.en.rst | 10 ----------
 lib/records/RecHttp.cc                      |  7 -------
 mgmt/RecordsConfig.cc                       |  2 --
 proxy/config/records.config.default.in      |  6 ------
 6 files changed, 27 deletions(-)

diff --git a/ci/tsqa/tests/test_http2.py b/ci/tsqa/tests/test_http2.py
index 075f00a32b7..7f8be87ba3a 100644
--- a/ci/tsqa/tests/test_http2.py
+++ b/ci/tsqa/tests/test_http2.py
@@ -40,7 +40,6 @@ def setUpEnv(cls, env):
         cls.http2_port = tsqa.utils.bind_unused_port()[1]
 
         # HTTP2 configs
-        cls.configs['records.config']['CONFIG']['proxy.config.http2.enabled'] = 1
         cls.configs['records.config']['CONFIG']['proxy.config.http.server_ports'] += ' {0}:ssl'.format(cls.http2_port)
         cls.configs['records.config']['CONFIG']['proxy.config.ssl.server.cert.path'] = helpers.tests_file_path('rsa_keys')
         cls.configs['records.config']['CONFIG']['proxy.config.diags.debug.enabled'] = 1
diff --git a/ci/tsqa/tests/test_http2_spec.py b/ci/tsqa/tests/test_http2_spec.py
index 6c53126ce72..915ca1a8180 100644
--- a/ci/tsqa/tests/test_http2_spec.py
+++ b/ci/tsqa/tests/test_http2_spec.py
@@ -64,7 +64,6 @@ def setUpEnv(cls, env):
         cls.http2_port = tsqa.utils.bind_unused_port()[1]
 
         # HTTP2 configs
-        cls.configs['records.config']['CONFIG']['proxy.config.http2.enabled'] = 1
         cls.configs['records.config']['CONFIG']['proxy.config.http.server_ports'] += ' {0}:ssl'.format(cls.http2_port)
         cls.configs['records.config']['CONFIG']['proxy.config.ssl.server.cert.path'] = helpers.tests_file_path('rsa_keys')
         cls.configs['records.config']['CONFIG']['proxy.config.diags.debug.enabled'] = 1
diff --git a/doc/admin-guide/files/records.config.en.rst b/doc/admin-guide/files/records.config.en.rst
index 81917844b29..bea44730306 100644
--- a/doc/admin-guide/files/records.config.en.rst
+++ b/doc/admin-guide/files/records.config.en.rst
@@ -3276,16 +3276,6 @@ HTTP/2 Configuration
 ====================
 
 
-.. ts:cv:: CONFIG proxy.config.http2.enabled INT 0
-
-   Enable the experimental HTTP/2 feature. This implements most of the
-   specifications, with the one big exception being server PUSH.
-
-.. note::
-
-   This configuration will be eliminated for v6.0.0, where HTTP/2 is
-   enabled by default and controlled via the ports configuration.
-
 .. ts:cv:: CONFIG proxy.config.http2.max_concurrent_streams_in INT 100
    :reloadable:
 
diff --git a/lib/records/RecHttp.cc b/lib/records/RecHttp.cc
index cf3c35f4964..d9170f3e9c5 100644
--- a/lib/records/RecHttp.cc
+++ b/lib/records/RecHttp.cc
@@ -618,13 +618,6 @@ ts_session_protocol_well_known_name_indices_init()
 
   DEFAULT_TLS_SESSION_PROTOCOL_SET.markAllIn();
 
-  // Don't enable HTTP/2 by default until it is stable.
-  int http2_enabled = 0;
-  REC_ReadConfigInteger(http2_enabled, "proxy.config.http2.enabled");
-  if (!http2_enabled) {
-    DEFAULT_TLS_SESSION_PROTOCOL_SET.markOut(HTTP2_PROTOCOL_SET);
-  }
-
   DEFAULT_NON_TLS_SESSION_PROTOCOL_SET = HTTP_PROTOCOL_SET;
 }
 
diff --git a/mgmt/RecordsConfig.cc b/mgmt/RecordsConfig.cc
index d5778b41f03..f702a9fd4f7 100644
--- a/mgmt/RecordsConfig.cc
+++ b/mgmt/RecordsConfig.cc
@@ -1438,8 +1438,6 @@ static const RecordElement RecordsConfig[] =
   //# HTTP/2 global configuration.
   //#
   //############
-  {RECT_CONFIG, "proxy.config.http2.enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
-  ,
   {RECT_CONFIG, "proxy.config.http2.stream_priority_enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
   ,
   {RECT_CONFIG, "proxy.config.http2.max_concurrent_streams_in", RECD_INT, "100", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
diff --git a/proxy/config/records.config.default.in b/proxy/config/records.config.default.in
index e91cc08b8c4..16a8af61ce3 100644
--- a/proxy/config/records.config.default.in
+++ b/proxy/config/records.config.default.in
@@ -23,12 +23,6 @@ CONFIG proxy.config.exec_thread.affinity INT 1
 ##############################################################################
 CONFIG proxy.config.http.server_ports STRING 8080
 
-##############################################################################
-# Enable HTTP/2 Support. Docs:
-#    https://docs.trafficserver.apache.org/records.config#http-2-configuration
-##############################################################################
-CONFIG proxy.config.http2.enabled INT 0
-
 ##############################################################################
 # Via: headers. Docs:
 #     https://docs.trafficserver.apache.org/records.config#proxy-config-http-insert-response-via-str