From 66f5d897b5d907d1fe3aee7f26121e13ab2a3cb5 Mon Sep 17 00:00:00 2001
From: joanhey <joanhey@kumbiaphp.com>
Date: Mon, 17 Aug 2026 19:15:08 +0200
Subject: [PATCH 1/2] nginx using debian trixie

---
 frameworks/nginx/Dockerfile | 24 +++++++-----------------
 frameworks/nginx/meta.json  |  2 ++
 frameworks/nginx/nginx.conf |  9 +++++++++
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/frameworks/nginx/Dockerfile b/frameworks/nginx/Dockerfile
index 65351ee20..33573595f 100644
--- a/frameworks/nginx/Dockerfile
+++ b/frameworks/nginx/Dockerfile
@@ -1,19 +1,14 @@
-ARG NGINX_VERSION=1.30.0
+ARG NGINX_VERSION=1.31.3
 
-FROM debian:bookworm AS build
+FROM debian:trixie AS build
 
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    build-essential libpcre2-dev zlib1g-dev wget ca-certificates git perl cmake
+    build-essential libpcre2-dev libssl-dev zlib1g-dev libgd-dev curl ca-certificates gnupg wget git perl cmake -y
 
 # Build quictls (OpenSSL fork with QUIC support). Pinned to the same tag as
 # docker/h2load-h3.Dockerfile — the 3.1.5+quic branch this used to track no
 # longer configures on current bookworm (perl aborts in Configure).
 WORKDIR /tmp
-RUN git clone --depth 1 -b openssl-3.3.0-quic1 https://github.com/quictls/openssl.git quictls && \
-    cd quictls && \
-    ./config --prefix=/opt/quictls --libdir=lib no-tests && \
-    make -j$(nproc) && \
-    make install_sw
 
 # Download nginx source
 ARG NGINX_VERSION
@@ -40,25 +35,20 @@ RUN ./configure \
     --with-http_gzip_static_module \
     --add-module=/tmp/ngx_brotli \
     --add-module=/tmp/module \
-    --with-cc-opt="-O3 -march=native -DNDEBUG -I/opt/quictls/include" \
-    --with-ld-opt="-lm -L/opt/quictls/lib -Wl,-rpath,/opt/quictls/lib" && \
+    --with-cc-opt="-O3 -march=native -DNDEBUG" && \
     make -j$(nproc)
 
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 RUN apt-get update && apt-get install -y --no-install-recommends \
     libpcre2-8-0 && \
     rm -rf /var/lib/apt/lists/*
-# Copy the install tree rather than naming versioned sonames: make install_sw
-# already lays down the right symlinks, and hand-written ones broke the moment
-# the quictls pin moved.
-COPY --from=build /opt/quictls/lib/ /opt/quictls/lib/
-RUN ldconfig /opt/quictls/lib
+
 ARG NGINX_VERSION
 COPY --from=build /tmp/nginx-${NGINX_VERSION}/objs/nginx /usr/sbin/nginx
 RUN mkdir -p /usr/local/nginx/logs
 
 COPY nginx.conf /usr/local/nginx/conf/nginx.conf
 
-EXPOSE 8080 8081 8443/tcp 8443/udp
+EXPOSE 8080 8081 8082 8443/tcp 8443/udp
 
 CMD ["nginx"]
diff --git a/frameworks/nginx/meta.json b/frameworks/nginx/meta.json
index dc15e4481..9fd0231d9 100644
--- a/frameworks/nginx/meta.json
+++ b/frameworks/nginx/meta.json
@@ -16,6 +16,8 @@
     "static-tls",
     "baseline-h2",
     "static-h2",
+    "baseline-h2c",
+    "json-h2c",
     "baseline-h3",
     "static-h3"
   ],
diff --git a/frameworks/nginx/nginx.conf b/frameworks/nginx/nginx.conf
index f94263e0e..752309bca 100644
--- a/frameworks/nginx/nginx.conf
+++ b/frameworks/nginx/nginx.conf
@@ -95,6 +95,15 @@ http {
         }
     }
 
+    server {
+        listen 8082 reuseport;
+        http2 on;
+        
+        location / {
+            httparena;
+        }
+    }
+
     server {
         listen 8443 ssl reuseport;
         listen 8443 quic reuseport;

From b29c5c02e5186f6c97e1847d0714a41709f73e95 Mon Sep 17 00:00:00 2001
From: joanhey <joanhey@kumbiaphp.com>
Date: Mon, 17 Aug 2026 19:23:11 +0200
Subject: [PATCH 2/2] Remove h2c tests for now

---
 frameworks/nginx/meta.json  |  2 --
 frameworks/nginx/nginx.conf | 14 +++++++-------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/frameworks/nginx/meta.json b/frameworks/nginx/meta.json
index 9fd0231d9..dc15e4481 100644
--- a/frameworks/nginx/meta.json
+++ b/frameworks/nginx/meta.json
@@ -16,8 +16,6 @@
     "static-tls",
     "baseline-h2",
     "static-h2",
-    "baseline-h2c",
-    "json-h2c",
     "baseline-h3",
     "static-h3"
   ],
diff --git a/frameworks/nginx/nginx.conf b/frameworks/nginx/nginx.conf
index 752309bca..2dde3ab77 100644
--- a/frameworks/nginx/nginx.conf
+++ b/frameworks/nginx/nginx.conf
@@ -95,14 +95,14 @@ http {
         }
     }
 
-    server {
-        listen 8082 reuseport;
-        http2 on;
+    #server {
+    #    listen 8082 reuseport;
+    #    http2 on;
         
-        location / {
-            httparena;
-        }
-    }
+    #    location / {
+    #        httparena;
+    #    }
+    #}
 
     server {
         listen 8443 ssl reuseport;