Merge branch 'nginx:master' into master

Author: kohanax

.editorconfig

@@ -0,0 +1,31 @@
+root = true
+
+[{configure,{*.{c,cpp,h,go,java,js,py,rs}}}]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 4
+
+[Makefile]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 8
+
+[{auto/**,*.toml}]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.yaml]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = space
+indent_size = 2

.github/workflows/ci-dev-distro-compiler.yaml

@@ -37,9 +37,11 @@ jobs:
           dnf -y update
           dnf -y install --setopt=install_weak_deps=False \
               which wget git gcc make pcre2-devel openssl-devel \
+              zlib-ng-compat-devel libzstd-devel brotli-devel \
               python-unversioned-command python3 python3-devel \
               php-devel php-embedded perl-devel perl-ExtUtils-Embed \
-              ruby-devel java-devel nodejs-devel nodejs-npm golang
+              ruby-devel java-devel nodejs-devel nodejs-npm golang \
+              cargo rust
           if [ "${{ matrix.compiler }}" = "clang" ]; then
             dnf -y install --setopt=install_weak_deps=False clang
           fi
@@ -50,9 +52,9 @@ jobs:
       - name: configure unit CC=${{ matrix.compiler }}
         run: |
           if [ "${{ matrix.compiler }}" = "clang" ]; then
-            ./configure --openssl --cc=clang
+            ./configure --openssl --otel --zlib --zstd --brotli --cc=clang
           else
-            ./configure --openssl
+            ./configure --openssl --otel --zlib --zstd --brotli
           fi
 
       - name: make unit
@@ -128,7 +130,9 @@ jobs:
         run: |
           apk update && apk upgrade
           apk add gcc make musl-dev openssl-dev pcre2-dev curl \
-              php83-dev php83-embed python3-dev perl-dev ruby-dev openjdk21-jdk
+              zlib-dev zstd-dev brotli-dev \
+              php83-dev php83-embed python3-dev perl-dev ruby-dev \
+              openjdk21-jdk cargo rust
           if [ "${{ matrix.compiler }}" = "clang" ]; then
             apk add clang
           fi
@@ -138,9 +142,9 @@ jobs:
       - name: configure unit CC=${{ matrix.compiler }}
         run: |
           if [ "${{ matrix.compiler }}" = "clang" ]; then
-            ./configure --openssl --cc=clang
+            ./configure --openssl --otel --zlib --zstd --brotli --cc=clang
           else
-            ./configure --openssl
+            ./configure --openssl --otel --zlib --zstd --brotli
           fi
 
       - name: make unit

.github/workflows/ci.yml

@@ -8,6 +8,7 @@ on:
       - 'go/**'
       - 'src/**'
       - 'test/**'
+      - 'pkg/contrib/**'
       - '.github/workflows/ci.yml'
   push:
     branches: master
@@ -17,6 +18,7 @@ on:
       - 'go/**'
       - 'src/**'
       - 'test/**'
+      - 'pkg/contrib/**'
       - '.github/workflows/ci.yml'
 
 jobs:
@@ -46,8 +48,6 @@ jobs:
             os: ubuntu-latest
           - build: perl
             os: ubuntu-latest
-          - build: php-8.1
-            os: ubuntu-latest
           - build: php-8.2
             os: ubuntu-latest
           - build: php-8.3
@@ -99,12 +99,21 @@ jobs:
       # https://github.com/actions/runner-images/issues/2821
       - name: Kill mono process
         run: |
-          sudo systemctl stop mono-xsp4.service
-          sudo systemctl mask mono-xsp4.service
-          sudo systemctl status mono-xsp4.service || true
-          PID=$(sudo lsof -t -i :8084)
-          echo "Killing PID $PID"
-          sudo kill -9 $PID
+          set +e
+          sudo systemctl status mono-xsp4.service
+          if [ $? -ne 0 ]; then
+            true
+          else
+            sudo systemctl stop mono-xsp4.service
+            sudo systemctl mask mono-xsp4.service
+            sudo systemctl status mono-xsp4.service
+            PID=$(sudo lsof -t -i :8084)
+            echo "Killing PID $PID"
+            sudo kill -9 $PID
+          fi
+
+      - name: Install packages
+        run: sudo apt-get -y install libbrotli-dev
 
       ##
       ## njs
@@ -133,6 +142,9 @@ jobs:
             --tests \
             --openssl \
             --njs \
+            --zlib \
+            --zstd \
+            --brotli \
             --cc-opt="-I njs/src/ -I njs/build"  \
             --ld-opt="-L njs/build"
 
@@ -303,7 +315,7 @@ jobs:
 
       - name: Configure wasm
         run: |
-          ./configure wasm --include-path=pkg/contrib/wasmtime/crates/c-api/include --lib-path=pkg/contrib/wasmtime/target/release
+          ./configure wasm --include-path=pkg/contrib/wasmtime/artifacts/include --lib-path=pkg/contrib/wasmtime/artifacts/lib
         if: steps.metadata.outputs.module == 'wasm'
 
       - name: Make wasm
@@ -318,6 +330,7 @@ jobs:
       - name: Setup rust
         run: |
           curl https://sh.rustup.rs | sh -s -- -y
+          cargo install cargo-component
         if: steps.metadata.outputs.module == 'wasm-wasi-component'
 
       - name: Configure wasm-wasi-component
@@ -347,18 +360,19 @@ jobs:
       - uses: actions/setup-python@v5
         with:
           python-version: '3'
-        if: steps.metadata.outputs.module != 'wasm' &&
-            steps.metadata.outputs.module != 'wasm-wasi-component'
+        if: steps.metadata.outputs.module != 'wasm'
 
       - name: Install pytest
         run: |
-          sudo -H pip install pytest
-        if: steps.metadata.outputs.module != 'wasm' &&
-            steps.metadata.outputs.module != 'wasm-wasi-component'
+          sudo apt install -y python3-pytest
+
+        if: steps.metadata.outputs.module != 'wasm'
 
       - name: Run ${{ steps.metadata.outputs.module }} tests
         run: |
-          sudo -E pytest --print-log ${{ steps.metadata.outputs.testpath }}
-        # Skip pytest if wasm build, as there are no tests yet
-        if: steps.metadata.outputs.module != 'wasm' &&
-            steps.metadata.outputs.module != 'wasm-wasi-component'
+          if [ "${{ matrix.build }}" == "wasm-wasi-component" ]; then
+            pytest-3 --print-log ${{ steps.metadata.outputs.testpath }}
+          else
+            sudo -E pytest-3 --print-log ${{ steps.metadata.outputs.testpath }}
+          fi
+        if: steps.metadata.outputs.module != 'wasm'

.github/workflows/cifuzz.yml

@@ -27,7 +27,7 @@ jobs:
         fuzz-seconds: 300
         output-sarif: true
     - name: Upload Crash
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure() && steps.build.outcome == 'success'
       with:
         name: artifacts

.github/workflows/clang-ast.yaml

@@ -0,0 +1,76 @@
+name: "Clang AST"
+
+on:
+  push:
+    branches: master
+    paths:
+      - configure
+      - 'auto/**'
+      - 'src/**'
+      - 'test/**'
+      - '.github/workflows/clang-ast.yaml'
+  pull_request:
+    branches: master
+    paths:
+      - configure
+      - 'auto/**'
+      - 'src/**'
+      - 'test/**'
+      - '.github/workflows/clang-ast.yaml'
+
+jobs:
+  clang-ast:
+    runs-on: ubuntu-latest
+
+    container:
+      image: debian:testing
+
+    steps:
+      - name: Install tools/deps
+        run: |
+          apt-get -y update
+          apt-get -y install git wget curl llvm-dev libclang-dev clang make \
+                             libssl-dev libpcre2-dev libperl-dev \
+                             libphp-embed php-dev python3-dev libpython3-dev \
+                             ruby-dev openjdk-21-jdk npm
+          npm install -g node-gyp
+
+      - uses: actions/checkout@v4
+
+      - name: Checkout and build clang-ast
+        run: |
+          git clone https://github.com/nginx/clang-ast.git -b unit
+          cd clang-ast
+          make
+
+      - name: Configure Unit
+        run: ./configure --cc=clang --cc-opt="-Xclang -load -Xclang clang-ast/ngx-ast.so -Xclang -add-plugin -Xclang ngx-ast" --openssl --debug --tests
+
+      - name: Build Unit
+        run: make -j4 unitd
+
+      - name: Build C tests
+        run: make -j4 tests
+
+      - name: Build Perl language module
+        run: ./configure perl && make -j4 perl
+
+      - name: Build PHP language module
+        run: ./configure php && make -j4 php
+
+      - name: Build Python language module
+        run: ./configure python --config=python3-config && make -j4 python3
+
+      - name: Build Ruby language module
+        run: ./configure ruby && make -j4 ruby
+
+      - name: Build Java support
+        run: ./configure java && make -j4 java
+
+      - name: Build Nodejs support
+        run: ./configure nodejs && make node-local-install DESTDIR=node
+
+      - name: Build wasm language module
+        run: |
+          wget -q -O- https://github.com/bytecodealliance/wasmtime/releases/download/v26.0.0/wasmtime-v26.0.0-x86_64-linux-c-api.tar.xz | tar -xJf -
+          ./configure wasm --include-path=wasmtime-v26.0.0-x86_64-linux-c-api/include --lib-path=wasmtime-v26.0.0-x86_64-linux-c-api/lib --rpath && make wasm

.github/workflows/unitctl.yml

@@ -5,6 +5,7 @@ on:
   pull_request:
     paths:
       - tools/unitctl/**
+      - docs/unit-openapi.yaml
   push:
     branches:
       - master
@@ -185,10 +186,8 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "unitctl-*"
-          # false if triggered by a tag
-          prerelease: ${{github.event_name == 'workflow_dispatch' && true}}
-          tag: ${{(github.event_name == 'workflow_dispatch' && inputs.version) || github.ref_name}}
-          name: unitctl/${{(github.event_name=='workflow_dispatch' && inputs.version) || github.ref_name}}
+          prerelease: ${{ github.event_name == 'workflow_dispatch' }}
+          tag: ${{ inputs.version && format('unitctl/{0}', inputs.version) || github.ref_name }}
           body: >
             ## Unitctl
 

.hgignore

@@ -11,6 +11,7 @@ Dan Callahan <d.callahan@f5.com> <dan.callahan@gmail.com>
 Danielle De Leo <d.deleo@f5.com> <danielle@fastmail.net>
 Dylan Arbour <d.arbour@f5.com> <arbourd@users.noreply.github.com>
 Dylan Arbour <d.arbour@f5.com> <7211830+arbourd@users.noreply.github.com>
+Igor Ippolitov <i.ippolitov@f5.com> <iippolitov@gmail.com>
 Konstantin Pavlov <thresh@nginx.com> <thresh@videolan.org>
 Konstantin Pavlov <thresh@nginx.com> <pavlov.konstantin@gmail.com>
 Max Romanov <max.romanov@gmail.com> <max.romanov@nginx.com>