compatible with the ssl old config enbale_http2

Signed-off-by: wayne-cheng <zhengwei@tiduyun.com>
apache · Aug 23, 2021 · 8f69513 · 8f69513
1 parent a26c8fc
commit 8f69513
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/apisix/cli/ops.lua b/apisix/cli/ops.lua
@@ -539,17 +539,17 @@ Please modify "admin_key" in conf/config.yaml .
     -- listen in https, support multiple ports, support specific IP
     if type(yaml_conf.apisix.ssl.listen) == "number" then
         listen_table_insert(ssl_listen, "https", "0.0.0.0", yaml_conf.apisix.ssl.listen,
-                false, yaml_conf.apisix.enable_ipv6)
+                yaml_conf.apisix.ssl.enable_http2, yaml_conf.apisix.enable_ipv6)
     elseif type(yaml_conf.apisix.ssl.listen) == "table" then
         for _, value in ipairs(yaml_conf.apisix.ssl.listen) do
             if type(value) == "number" then
                 listen_table_insert(ssl_listen, "https", "0.0.0.0", value,
-                        false, yaml_conf.apisix.enable_ipv6)
+                        yaml_conf.apisix.ssl.enable_http2, yaml_conf.apisix.enable_ipv6)
             elseif type(value) == "table" then
                 local ip = value.ip
                 local port = value.port
                 local enable_ipv6 = false
-                local enable_http2 = value.enable_http2
+                local enable_http2 = (value.enable_http2 or yaml_conf.apisix.ssl.enable_http2)
 
                 if ip == nil then
                     ip = "0.0.0.0"

diff --git a/conf/config-default.yaml b/conf/config-default.yaml
@@ -128,7 +128,7 @@ apisix:
     #   - ip: 127.0.0.3           # Specific IP, If not set, the default value is `0.0.0.0`.
     #     port: 9445
     #     enable_http2: true
-    enable_http2: true            # Not recommend: This parameter should be set via the `listen`. It is only used for `listen_port`.
+    enable_http2: true            # Not recommend: This parameter should be set via the `listen`.
     # listen_port: 9443           # Not recommend: This parameter should be set via the `listen`.
     #ssl_trusted_certificate: /path/to/ca-cert  # Specifies a file path with trusted CA certificates in the PEM format
                                                 # used to verify the certificate when APISIX needs to do SSL/TLS handshaking

diff --git a/t/cli/test_main.sh b/t/cli/test_main.sh
@@ -132,6 +132,7 @@ apisix:
       port: 9082
       enable_http2: true
   ssl:
+    enable_http2: false
     listen:
       - ip: 127.0.0.3
         port: 9444