[trafficserver] branch 9.0.x updated: Fix port selection for ssl ipv6

[zw...@apache.org]

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

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


The following commit(s) were added to refs/heads/9.0.x by this push:
     new f250cce  Fix port selection for ssl ipv6
f250cce is described below

commit f250cce4c8a9c6d46346574b2479ec2e7e53adfb
Author: Jason Kenny <dr...@live.com>
AuthorDate: Wed Feb 26 11:49:36 2020 -0600

    Fix port selection for ssl ipv6
    
    (cherry picked from commit 4f25f3d2dd81028247c13208064d9c5a36cf374e)
---
 tests/gold_tests/autest-site/trafficserver.test.ext | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/gold_tests/autest-site/trafficserver.test.ext b/tests/gold_tests/autest-site/trafficserver.test.ext
index 34af4ff..423af0f 100755
--- a/tests/gold_tests/autest-site/trafficserver.test.ext
+++ b/tests/gold_tests/autest-site/trafficserver.test.ext
@@ -261,6 +261,7 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True, enabl
     # set up default ports
     # get some ports  TODO make it so we can hold on to the socket
     if select_ports:
+
         # some system have a bug in which ipv4 and ipv6 share port space
         # Make two different ports to avoid this
         get_port(p, "port")
@@ -268,6 +269,7 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True, enabl
 
         if enable_tls:
             get_port(p, "ssl_port")
+            get_port(p, "ssl_portv6")
         # p.Ready = When.PortOpen(p.Variables.port)
     else:
         p.Variables.port = 8080
@@ -287,7 +289,7 @@ def MakeATSProcess(obj, name, command='traffic_server', select_ports=True, enabl
         port_str = "{port} {v6_port}:ipv6 ".format(port=p.Variables.port, v6_port=p.Variables.portv6)
 
         if enable_tls:
-            port_str += "{ssl_port}:ssl".format(ssl_port=p.Variables.ssl_port)
+            port_str += "{ssl_port}:ssl {ssl_portv6}:ssl:ipv6".format(ssl_port=p.Variables.ssl_port,ssl_portv6=p.Variables.ssl_portv6)
 
         p.Env['PROXY_CONFIG_HTTP_SERVER_PORTS'] = port_str