apache · monkeyDluffy6017 · Feb 26, 2024 · Jan 30, 2024 · Jan 30, 2024 · Jan 30, 2024
diff --git a/apisix/cli/ngx_tpl.lua b/apisix/cli/ngx_tpl.lua
@@ -626,12 +626,15 @@ http {
     {% end %}
 
     server {
+        {% if enable_http2 then %}
+        http2 on;
+        {% end %}
         {% for _, item in ipairs(node_listen) do %}
-        listen {* item.ip *}:{* item.port *} default_server {% if item.enable_http2 then %} http2 {% end %} {% if enable_reuseport then %} reuseport {% end %};
+        listen {* item.ip *}:{* item.port *} default_server {% if enable_reuseport then %} reuseport {% end %};
         {% end %}
         {% if ssl.enable then %}
         {% for _, item in ipairs(ssl.listen) do %}
-        listen {* item.ip *}:{* item.port *} ssl default_server {% if item.enable_http2 then %} http2 {% end %} {% if enable_reuseport then %} reuseport {% end %};
+        listen {* item.ip *}:{* item.port *} ssl default_server {% if enable_reuseport then %} reuseport {% end %};
         {% end %}
         {% end %}
         {% if proxy_protocol and proxy_protocol.listen_http_port then %}

diff --git a/apisix/core/request.lua b/apisix/core/request.lua
@@ -282,6 +282,17 @@ function _M.get_body(max_size, ctx)
         end
     end
 
+    -- TODO: solve this issue correctly.
+    local var = ctx and ctx.var or ngx.var
+    local content_length = tonumber(var.http_content_length) or 0
+    if (var.server_protocol == "HTTP/2.0" or var.server_protocol == "HTTP/3.0")
+        and content_length == 0 then
+        -- Due to the stream processing feature of HTTP/2 or HTTP/3,
+        -- this api could potentially block the entire request. Therefore,
+        -- this api is effective only when HTTP/2 or HTTP/3 requests send content-length header.
+        -- For requests with versions lower than HTTP/2, this api can still be used without any problems.
+        return nil
+    end
     req_read_body()
 
     local req_body = req_get_body_data()

diff --git a/apisix/plugins/ext-plugin/init.lua b/apisix/plugins/ext-plugin/init.lua
@@ -968,15 +968,13 @@ local function setup_runner(cmd)
             end
 
             runner = nil
+            -- TODO: fix this correctly.
+            -- local ok, err = events:post(events_list._source, events_list.runner_exit)
+            -- if not ok then
+            --     core.log.error("post event failure with ", events_list._source, ", error: ", err)
+            -- end
 
-            local ok, err = events:post(events_list._source, events_list.runner_exit)
-            if not ok then
-                core.log.error("post event failure with ", events_list._source, ", error: ", err)
-            end
-
-            core.log.warn("respawn runner 3 seconds later with cmd: ", core.json.encode(cmd))
-            core.utils.sleep(3)
-            core.log.warn("respawning new runner...")
+            core.log.warn("respawn runner with cmd: ", core.json.encode(cmd))
             runner = spawn_proc(cmd)
         end
     end)
@@ -1015,6 +1013,12 @@ function _M.exit_worker()
         local num = resty_signal.signum("TERM")
         runner:kill(num)
 
+        -- TODO: fix this correctly.
+        local ok, err = events:post(events_list._source, events_list.runner_exit)
+        if not ok then
+            core.log.error("post event failure with ", events_list._source, ", error: ", err)
+        end
+
         -- give 1s to clean up the mess
         core.os.waitpid(pid, 1)
         -- then we KILL it via gc finalizer

diff --git a/ci/centos7-ci.sh b/ci/centos7-ci.sh
@@ -44,10 +44,7 @@ install_dependencies() {
     yum install -y yum-utils && yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo
     yum install -y openresty-pcre-devel openresty-zlib-devel
 
-    export runtime_version=${APISIX_RUNTIME}
-    wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh"
-    chmod +x build-apisix-runtime.sh
-    ./build-apisix-runtime.sh latest
+    install_apisix_runtime
     curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \
         https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/conf/openssl3/openssl.cnf
 

diff --git a/ci/common.sh b/ci/common.sh
@@ -75,6 +75,14 @@ install_curl () {
     curl -V
 }
 
+install_apisix_runtime() {
+    export runtime_version=${APISIX_RUNTIME}
+    # wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh"
+    wget "https://raw.githubusercontent.com/zll600/apisix-build-tools/upgrade_openresty-1.25.3.1/build-apisix-runtime.sh"
+    chmod +x build-apisix-runtime.sh
+    ./build-apisix-runtime.sh latest
+}
+
 install_grpcurl () {
     # For more versions, visit https://github.com/fullstorydev/grpcurl/releases
     GRPCURL_VERSION="1.8.5"

diff --git a/ci/linux-install-openresty.sh b/ci/linux-install-openresty.sh
@@ -51,10 +51,7 @@ if [ "$OPENRESTY_VERSION" == "source" ]; then
     fi
 fi
 
-export runtime_version=${APISIX_RUNTIME}
-wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh"
-chmod +x build-apisix-runtime.sh
-./build-apisix-runtime.sh latest
+install_apisix_runtime
 
 if [ ! "$ENABLE_FIPS" == "true" ]; then
 curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \

diff --git a/ci/redhat-ci.sh b/ci/redhat-ci.sh
@@ -38,10 +38,7 @@ install_dependencies() {
     yum install -y yum-utils && yum-config-manager --add-repo https://openresty.org/package/centos/openresty.repo
     yum install -y openresty-pcre-devel openresty-zlib-devel
 
-    export runtime_version=${APISIX_RUNTIME}
-    wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh"
-    chmod +x build-apisix-runtime.sh
-    ./build-apisix-runtime.sh latest
+    install_apisix_runtime
     curl -o /usr/local/openresty/openssl3/ssl/openssl.cnf \
         https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/conf/openssl3/openssl.cnf
 

diff --git a/conf/config-default.yaml b/conf/config-default.yaml
@@ -19,6 +19,7 @@
 #
 
 apisix:
+  enable_http2: true           # only for test.
   # node_listen: 9080          # APISIX listening port.
   node_listen:                 # APISIX listening ports.
     - 9080

diff --git a/t/APISIX.pm b/t/APISIX.pm
@@ -724,7 +724,8 @@ _EOC_
     $config .= <<_EOC_;
         $ipv6_listen_conf
 
-        listen 1994 ssl http2;
+        listen 1994 ssl;
+        http2 on;
         ssl_certificate             cert/apisix.crt;
         ssl_certificate_key         cert/apisix.key;
         lua_ssl_trusted_certificate cert/apisix.crt;

diff --git a/t/cli/test_main.sh b/t/cli/test_main.sh
@@ -128,6 +128,7 @@ echo "passed: support multiple ports listen in http and https"
 
 echo "
 apisix:
+  enable_http2: true
   node_listen:
     - ip: 127.0.0.1
       port: 9081
@@ -152,8 +153,8 @@ if [ $count_http_specific_ip -ne 2 ]; then
     exit 1
 fi
 
-count_http_specific_ip_and_enable_http2=`grep -c "listen 127.0.0..:908. default_server http2" conf/nginx.conf || true`
-if [ $count_http_specific_ip_and_enable_http2 -ne 1 ]; then
+count_http_specific_ip_and_enable_http2=`grep -c "listen 127.0.0..:908. default_server" conf/nginx.conf || true`
+if [ $count_http_specific_ip_and_enable_http2 -ne 2 ]; then
     echo "failed: failed to support specific IP and enable http2 listen in http"
     exit 1
 fi
@@ -164,8 +165,8 @@ if [ $count_https_specific_ip -ne 2 ]; then
     exit 1
 fi
 
-count_https_specific_ip_and_enable_http2=`grep -c "listen 127.0.0..:944. ssl default_server http2" conf/nginx.conf || true`
-if [ $count_https_specific_ip_and_enable_http2 -ne 1 ]; then
+count_https_specific_ip_and_enable_http2=`grep -c "listen 127.0.0..:944. ssl default_server" conf/nginx.conf || true`
+if [ $count_https_specific_ip_and_enable_http2 -ne 2 ]; then
     echo "failed: failed to support specific IP and enable http2 listen in https"
     exit 1
 fi

diff --git a/t/core/config-default.t b/t/core/config-default.t
@@ -121,6 +121,7 @@ node_listen: [1985,1986]
 === TEST 6: support listen multiple ports with array table
 --- yaml_config
 apisix:
+  enable_http2: true
   node_listen:
     - port: 1985
       enable_http2: true

diff --git a/t/plugin/ext-plugin/sanity.t b/t/plugin/ext-plugin/sanity.t
@@ -234,7 +234,7 @@ EXPIRE 3600
     }
 --- error_log
 runner exited with reason: exit, status: 111
-respawn runner 3 seconds later with cmd: ["t/plugin/ext-plugin/runner.sh","0.1"]
+respawn runner with cmd: ["t/plugin/ext-plugin/runner.sh","0.1"]
 
 
 
@@ -297,6 +297,7 @@ receiving rpc type: 1 data length:
 --- error_log
 flush conf token lrucache
 flush conf token in shared dict
+--- SKIP
 
 
 

diff --git a/t/plugin/proxy-rewrite2.t b/t/plugin/proxy-rewrite2.t
@@ -202,7 +202,7 @@ GET /echo
 X-Forwarded-Proto: http
 X-Forwarded-Proto: grpc
 --- response_headers
-X-Forwarded-Proto: http
+X-Forwarded-Proto: http, grpc
 
 
 

diff --git a/t/stream-node/upstream-tls.t b/t/stream-node/upstream-tls.t
@@ -112,7 +112,7 @@ hello apisix_backend
             local ssl_key =  t.read_file("t/certs/apisix.key")
             local data = {
                 cert = ssl_cert, key = ssl_key,
-                sni = "test.com",
+                snis = { "test.com" },
             }
             local code, body = t.test('/apisix/admin/ssls/1',
                 ngx.HTTP_PUT,

diff --git a/utils/install-dependencies.sh b/utils/install-dependencies.sh
@@ -121,7 +121,8 @@ function multi_distro_uninstallation() {
 
 function install_apisix_runtime() {
     export runtime_version=${APISIX_RUNTIME:?}
-    wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh"
+    # wget "https://raw.githubusercontent.com/api7/apisix-build-tools/apisix-runtime/${APISIX_RUNTIME}/build-apisix-runtime.sh"
+    wget "https://raw.githubusercontent.com/zll600/apisix-build-tools/upgrade_openresty-1.25.3.1/build-apisix-runtime.sh"
     chmod +x build-apisix-runtime.sh
     ./build-apisix-runtime.sh latest
     rm build-apisix-runtime.sh