You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by wk...@apache.org on 2021/02/26 18:26:18 UTC
[trafficserver] branch master updated: Removes deprecated sni.yaml
option: disable_h2 (#7547)
This is an automated email from the ASF dual-hosted git repository.
wkaras pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/master by this push:
new 0c4857d Removes deprecated sni.yaml option: disable_h2 (#7547)
0c4857d is described below
commit 0c4857db3e296f3e74065ca6fb79f8638c10baf2
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Fri Feb 26 10:26:08 2021 -0800
Removes deprecated sni.yaml option: disable_h2 (#7547)
This was deprecated in 9.x.
---
doc/admin-guide/files/sni.yaml.en.rst | 3 ---
iocore/net/YamlSNIConfig.cc | 4 ----
iocore/net/YamlSNIConfig.h | 4 +---
3 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/doc/admin-guide/files/sni.yaml.en.rst b/doc/admin-guide/files/sni.yaml.en.rst
index 1000f1c..94b88c8 100644
--- a/doc/admin-guide/files/sni.yaml.en.rst
+++ b/doc/admin-guide/files/sni.yaml.en.rst
@@ -117,9 +117,6 @@ client_key The file containing the client private key that corres
http2 Indicates whether the H2 protocol should be added to or removed from the
protocol negotiation list. The valid values are :code:`on` or :code:`off`.
-disable_h2 Deprecated for the more general h2 setting. Setting disable_h2
- to :code:`true` is the same as setting http2 to :code:`on`.
-
tunnel_route Destination as an FQDN and port, separated by a colon ``:``.
Match group number can be specified by ``$N`` where N should refer to a specified group
in the FQDN, ``tunnel_route: $1.domain``.
diff --git a/iocore/net/YamlSNIConfig.cc b/iocore/net/YamlSNIConfig.cc
index 348a7d7..6744bd3 100644
--- a/iocore/net/YamlSNIConfig.cc
+++ b/iocore/net/YamlSNIConfig.cc
@@ -123,7 +123,6 @@ TsEnumDescriptor PROPERTIES_DESCRIPTOR = {{{"NONE", 0}, {"SIGNATURE", 0x1}, {
TsEnumDescriptor TLS_PROTOCOLS_DESCRIPTOR = {{{"TLSv1", 0}, {"TLSv1_1", 1}, {"TLSv1_2", 2}, {"TLSv1_3", 3}}};
std::set<std::string> valid_sni_config_keys = {TS_fqdn,
- TS_disable_h2,
TS_verify_client,
TS_verify_client_ca_certs,
TS_tunnel_route,
@@ -159,9 +158,6 @@ template <> struct convert<YamlSNIConfig::Item> {
} else {
return false; // servername must be present
}
- if (node[TS_disable_h2]) {
- item.offer_h2 = false;
- }
if (node[TS_http2]) {
item.offer_h2 = node[TS_http2].as<bool>();
}
diff --git a/iocore/net/YamlSNIConfig.h b/iocore/net/YamlSNIConfig.h
index 6b58116..0640f31 100644
--- a/iocore/net/YamlSNIConfig.h
+++ b/iocore/net/YamlSNIConfig.h
@@ -32,7 +32,6 @@
#define TSDECL(id) constexpr char TS_##id[] = #id
TSDECL(fqdn);
-TSDECL(disable_h2);
TSDECL(verify_client);
TSDECL(verify_client_ca_certs);
TSDECL(tunnel_route);
@@ -53,8 +52,7 @@ TSDECL(host_sni_policy);
const int start = 0;
struct YamlSNIConfig {
enum class Action {
- disable_h2 = start,
- verify_client,
+ verify_client = start,
verify_client_ca_certs,
tunnel_route, // blind tunnel action
forward_route, // decrypt data and then blind tunnel action