Set pip size function only on linux (#1994)

* Set pip size function only on linux

* update testcase docker image version

* update testcase docker image to ubuntu 22.04

* update testcase docker image to ubuntu 24.04

* fix depend lib

* fix depend lib

* fix testcase

* use one thread complie luajit2

* testcase: change arm image

* testcase: change arm image

* testcae: change arm image

* testcase: change arm image

* testcase: change arm image

Author: drawing

.github/workflows/ci-arm64.yml

@@ -7,7 +7,7 @@ on:
 
 jobs:
   build-arm64:
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     strategy:
       fail-fast: false
       matrix:
@@ -25,23 +25,23 @@ jobs:
           path: luajit2
 
       - name: Compile with ${{ matrix.compiler.compiler }}
-        uses: uraimo/run-on-arch-action@v2
+        uses: uraimo/run-on-arch-action@v3
         with:
           arch: aarch64
-          distro: ubuntu20.04
+          distro: ubuntu24.04
           githubToken: ${{ github.token }}
           dockerRunArgs: |
             --volume "${PWD}:/tengine"
           install: |
             set -x
             apt-get update -q -y
-            apt-get install -q -y make gcc g++ clang libgd-dev libgeoip-dev libxslt1-dev libpcre++0v5 libpcre++-dev liblua5.1-0-dev lua5.1 libperl-dev cpanminus libssl-dev file
+            apt-get install -q -y make gcc g++ clang libgd-dev libgeoip-dev libxslt1-dev libpcre3 libpcre3-dev liblua5.1-0-dev lua5.1 libperl-dev cpanminus libssl-dev file
           run: |
             set -x
             cd /tengine
             echo "Build luajit2"
             cd luajit2
-            make -j2
+            make -j4
             make install
             cd ..
             echo "Build tengine"
@@ -85,6 +85,6 @@ jobs:
               --add-module=./modules/ngx_multi_upstream_module \
               --add-module=./modules/ngx_slab_stat \
               --without-http_upstream_keepalive_module
-            make -j2
+            make -j4
             make install
             file /usr/local/nginx/sbin/nginx | grep aarch64

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-and-test:
-   runs-on: "ubuntu-20.04"
+   runs-on: "ubuntu-24.04"
    strategy:
      fail-fast: false
      matrix:
@@ -21,7 +21,7 @@ jobs:
        run: |
          sudo apt update
          sudo apt remove nginx libgd3
-         sudo apt install -y libgd-dev libgeoip-dev libxslt1-dev libpcre++0v5 libpcre++-dev liblua5.1-0-dev lua5.1 libperl-dev cpanminus libssl-dev
+         sudo apt install -y libgd-dev libgeoip-dev libxslt1-dev libpcre3 libpcre3-dev liblua5.1-0-dev lua5.1 libperl-dev cpanminus libssl-dev
      - name: 'checkout luajit2'
        uses: actions/checkout@v3
        with:

.github/workflows/test-nginx-core.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-and-test:
-   runs-on: "ubuntu-20.04"
+   runs-on: "ubuntu-24.04"
    strategy:
      fail-fast: false
      matrix:
@@ -21,7 +21,7 @@ jobs:
        run: |
          sudo apt update
          sudo apt remove nginx libgd3
-         sudo apt install -y libgd-dev libgeoip-dev libxslt1-dev libpcre++0v5 libpcre++-dev liblua5.1-0-dev lua5.1 libperl-dev cpanminus libssl-dev
+         sudo apt install -y libgd-dev libgeoip-dev libxslt1-dev libpcre3 libpcre3-dev liblua5.1-0-dev lua5.1 libperl-dev cpanminus libssl-dev
          # for building nginx core
          sudo apt install -y libgoogle-perftools-dev
          # for running cases in nginx-tests

.github/workflows/test-ntls.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build-and-test:
-    runs-on: "ubuntu-20.04"
+    runs-on: "ubuntu-24.04"
     strategy:
       fail-fast: false
       matrix:
@@ -19,6 +19,9 @@ jobs:
       - uses: actions/checkout@v3
         with:
           path: tengine
+      - name: get dependencies
+        run: |
+          sudo apt install -y libpcre3 libpcre3-dev
       - name: 'checkout luajit2'
         uses: actions/checkout@v3
         with:

auto/modules

@@ -1451,10 +1451,15 @@ cat << END                                    >> $NGX_MODULES_C
 
 END
 
+case "$NGX_PLATFORM" in
+    Linux:*)
+        have=T_PIPE_SET_SIZE . auto/have
+    ;;
+esac
+
 have=T_NGX_DNS_RESOLVE_BACKUP . auto/have
 have=T_NGX_MASTER_ENV . auto/have
 have=T_PIPES . auto/have
-have=T_PIPE_SET_SIZE . auto/have
 have=T_NGX_INPUT_BODY_FILTER . auto/have
 have=T_NGX_GZIP_CLEAR_ETAG . auto/have
 have=T_NGX_RESOLVER_FILE . auto/have

modules/ngx_http_lua_module/src/ngx_http_lua_headers_in.c

@@ -588,19 +588,20 @@ ngx_http_set_builtin_multi_header(ngx_http_request_t *r,
 {
 #if defined(nginx_version) && nginx_version >= 1023000
     ngx_table_elt_t  **headers, **ph, *h;
-    int                nelts;
 
     headers = (ngx_table_elt_t **) ((char *) &r->headers_in + hv->offset);
 
     if (!hv->no_override && *headers != NULL) {
-        nelts = 0;
+#if defined(DDEBUG) && (DDEBUG)
+        int  nelts = 0;
+        
         for (h = *headers; h; h = h->next) {
             nelts++;
         }
 
-        *headers = NULL;
-
         dd("clear multi-value headers: %d", nelts);
+#endif
+        *headers = NULL;
     }
 
     if (ngx_http_set_header_helper(r, hv, value, &h) == NGX_ERROR) {

modules/ngx_multi_upstream_module/ngx_multi_upstream_module.h

@@ -28,7 +28,7 @@ typedef struct {
 
     void                *data_c;
 
-    ngx_flag_t           connected:1;
+    ngx_uint_t           connected:1;
 
     void                *cur;
 } ngx_multi_connection_t;

tests/nginx-tests/nginx-tests/stream_status_variable.t

@@ -67,6 +67,8 @@ stream {
         listen      127.0.0.1:8084;
         proxy_pass  example.com:$remote_port;
         access_log  %%TESTDIR%%/500.log status;
+
+        proxy_connect_timeout 5;
     }
 
     server {