[trafficserver] branch master updated: Add test and fix regression with disable_h2 option

[bcall]

This is an automated email from the ASF dual-hosted git repository.

bcall 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 da271d0  Add test and fix regression with disable_h2 option
da271d0 is described below

commit da271d086682e02f344132019e9425ef0a4e5bd6
Author: Susan Hinrichs <shinr...@oath.com>
AuthorDate: Mon Nov 19 21:56:37 2018 +0000

    Add test and fix regression with disable_h2 option
---
 iocore/net/YamlSNIConfig.cc | 6 +++---
 iocore/net/YamlSNIConfig.h  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/iocore/net/YamlSNIConfig.cc b/iocore/net/YamlSNIConfig.cc
index 5366e4b..276b271 100644
--- a/iocore/net/YamlSNIConfig.cc
+++ b/iocore/net/YamlSNIConfig.cc
@@ -60,7 +60,7 @@ TsEnumDescriptor POLICY_DESCRIPTOR     = {{{"DISABLED", 0}, 
{"PERMISSIVE", 1}, {
 TsEnumDescriptor PROPERTIES_DESCRIPTOR = {{{"NONE", 0}, {"SIGNATURE", 0x1}, 
{"NAME", 0x2}, {"ALL", 0x3}}};
 
 std::set<std::string> valid_sni_config_keys = {TS_fqdn,
-                                               TS_disable_H2,
+                                               TS_disable_h2,
                                                TS_verify_client,
                                                TS_tunnel_route,
                                                TS_verify_origin_server,
@@ -88,8 +88,8 @@ template <> struct convert<YamlSNIConfig::Item> {
     } else {
       return false; // servername must be present
     }
-    if (node[TS_disable_H2]) {
-      item.disable_h2 = node[TS_disable_H2].as<bool>();
+    if (node[TS_disable_h2]) {
+      item.disable_h2 = node[TS_disable_h2].as<bool>();
     }
 
     // enum
diff --git a/iocore/net/YamlSNIConfig.h b/iocore/net/YamlSNIConfig.h
index 0cb6d64..444ae6b 100644
--- a/iocore/net/YamlSNIConfig.h
+++ b/iocore/net/YamlSNIConfig.h
@@ -28,7 +28,7 @@
 
 #define TSDECL(id) constexpr char TS_##id[] = #id
 TSDECL(fqdn);
-TSDECL(disable_H2);
+TSDECL(disable_h2);
 TSDECL(verify_client);
 TSDECL(tunnel_route);
 TSDECL(verify_server_policy);