[trafficserver] branch 8.1.x updated: Fixes H2 toggling using ssl_server_name.yaml (#7154)

[zw...@apache.org]

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

zwoop pushed a commit to branch 8.1.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/8.1.x by this push:
     new 5621853  Fixes H2 toggling using ssl_server_name.yaml (#7154)
5621853 is described below

commit 5621853a7a36a2fd6146327a4e3f1bf772012773
Author: Randall Meyer <rr...@apache.org>
AuthorDate: Tue Sep 1 15:26:38 2020 -0700

    Fixes H2 toggling using ssl_server_name.yaml (#7154)
    
    Prior to this, all entries in ssl_server_name.yaml would have H2
    disabled.
---
 iocore/net/SSLSNIConfig.cc | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/iocore/net/SSLSNIConfig.cc b/iocore/net/SSLSNIConfig.cc
index 90e71a7..6c7cfb1 100644
--- a/iocore/net/SSLSNIConfig.cc
+++ b/iocore/net/SSLSNIConfig.cc
@@ -64,8 +64,10 @@ SNIConfigParams::loadSNIConfig()
     auto wildcard = w_Matcher.match(servername);
 
     // set SNI based actions to be called in the ssl_servername_only callback
-    auto ai1 = new DisableH2();
-    aiVec->push_back(ai1);
+    if (item.disable_h2) {
+      aiVec->push_back(new DisableH2);
+    }
+
     auto ai2 = new VerifyClient(item.verify_client_level);
     aiVec->push_back(ai2);
     if (wildcard) {