From fcf44d2e8efa85426c3b1d83722b9165134bda69 Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Thu, 13 Nov 2025 09:41:04 -0300 Subject: [PATCH 1/2] Fix NGINX --- .github/workflows/ci-cd.yml | 1 + 8.1-swoole-nginx-prod/default.tmpl | 3 +-- 8.1-swoole-nginx/default.tmpl | 3 +-- 8.2-swoole-nginx-prod/default.tmpl | 3 +-- 8.2-swoole-nginx/default.tmpl | 3 +-- 8.3-swoole-nginx-prod/default.tmpl | 3 +-- 8.3-swoole-nginx/default.tmpl | 3 +-- 8.4-swoole-nginx-prod/default.tmpl | 3 +-- 8.4-swoole-nginx/default.tmpl | 3 +-- template/default-tmpl.blade.php | 3 +-- 10 files changed, 10 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 5f4e0c7..20e6825 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -51,6 +51,7 @@ jobs: run: | docker run localhost:5000/kooldev/php:${{ matrix.version }}${{ matrix.type }} php -r "extension_loaded('swoole') or die(1);" docker run localhost:5000/kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -v + docker run localhost:5000/kooldev/php:${{ matrix.version }}-nginx${{ matrix.type }} nginx -t - name: Tests (dev) if: matrix.type == '' diff --git a/8.1-swoole-nginx-prod/default.tmpl b/8.1-swoole-nginx-prod/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.1-swoole-nginx-prod/default.tmpl +++ b/8.1-swoole-nginx-prod/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.1-swoole-nginx/default.tmpl b/8.1-swoole-nginx/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.1-swoole-nginx/default.tmpl +++ b/8.1-swoole-nginx/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.2-swoole-nginx-prod/default.tmpl b/8.2-swoole-nginx-prod/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.2-swoole-nginx-prod/default.tmpl +++ b/8.2-swoole-nginx-prod/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.2-swoole-nginx/default.tmpl b/8.2-swoole-nginx/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.2-swoole-nginx/default.tmpl +++ b/8.2-swoole-nginx/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.3-swoole-nginx-prod/default.tmpl b/8.3-swoole-nginx-prod/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.3-swoole-nginx-prod/default.tmpl +++ b/8.3-swoole-nginx-prod/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.3-swoole-nginx/default.tmpl b/8.3-swoole-nginx/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.3-swoole-nginx/default.tmpl +++ b/8.3-swoole-nginx/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.4-swoole-nginx-prod/default.tmpl b/8.4-swoole-nginx-prod/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.4-swoole-nginx-prod/default.tmpl +++ b/8.4-swoole-nginx-prod/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.4-swoole-nginx/default.tmpl b/8.4-swoole-nginx/default.tmpl index cf13ec7..80d65b3 100644 --- a/8.4-swoole-nginx/default.tmpl +++ b/8.4-swoole-nginx/default.tmpl @@ -61,10 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/template/default-tmpl.blade.php b/template/default-tmpl.blade.php index 7f7b2f7..39afc80 100644 --- a/template/default-tmpl.blade.php +++ b/template/default-tmpl.blade.php @@ -61,10 +61,9 @@ add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions - include h5bp/internet_explorer/x-ua-compatible.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/security/x-xss-protection.conf; + include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; From 0ec3c7dcbda0f2f2443cd7262600d2bd5247564e Mon Sep 17 00:00:00 2001 From: Daniel Polito Date: Thu, 13 Nov 2025 09:41:45 -0300 Subject: [PATCH 2/2] Fix NGINX --- 8.1-swoole-nginx-prod/default.tmpl | 2 +- 8.1-swoole-nginx/default.tmpl | 2 +- 8.2-swoole-nginx-prod/default.tmpl | 2 +- 8.2-swoole-nginx/default.tmpl | 2 +- 8.3-swoole-nginx-prod/default.tmpl | 2 +- 8.3-swoole-nginx/default.tmpl | 2 +- 8.4-swoole-nginx-prod/default.tmpl | 2 +- 8.4-swoole-nginx/default.tmpl | 2 +- template/default-tmpl.blade.php | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/8.1-swoole-nginx-prod/default.tmpl b/8.1-swoole-nginx-prod/default.tmpl index 80d65b3..61e476b 100644 --- a/8.1-swoole-nginx-prod/default.tmpl +++ b/8.1-swoole-nginx-prod/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.1-swoole-nginx/default.tmpl b/8.1-swoole-nginx/default.tmpl index 80d65b3..61e476b 100644 --- a/8.1-swoole-nginx/default.tmpl +++ b/8.1-swoole-nginx/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.2-swoole-nginx-prod/default.tmpl b/8.2-swoole-nginx-prod/default.tmpl index 80d65b3..61e476b 100644 --- a/8.2-swoole-nginx-prod/default.tmpl +++ b/8.2-swoole-nginx-prod/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.2-swoole-nginx/default.tmpl b/8.2-swoole-nginx/default.tmpl index 80d65b3..61e476b 100644 --- a/8.2-swoole-nginx/default.tmpl +++ b/8.2-swoole-nginx/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.3-swoole-nginx-prod/default.tmpl b/8.3-swoole-nginx-prod/default.tmpl index 80d65b3..61e476b 100644 --- a/8.3-swoole-nginx-prod/default.tmpl +++ b/8.3-swoole-nginx-prod/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.3-swoole-nginx/default.tmpl b/8.3-swoole-nginx/default.tmpl index 80d65b3..61e476b 100644 --- a/8.3-swoole-nginx/default.tmpl +++ b/8.3-swoole-nginx/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.4-swoole-nginx-prod/default.tmpl b/8.4-swoole-nginx-prod/default.tmpl index 80d65b3..61e476b 100644 --- a/8.4-swoole-nginx-prod/default.tmpl +++ b/8.4-swoole-nginx-prod/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/8.4-swoole-nginx/default.tmpl b/8.4-swoole-nginx/default.tmpl index 80d65b3..61e476b 100644 --- a/8.4-swoole-nginx/default.tmpl +++ b/8.4-swoole-nginx/default.tmpl @@ -61,9 +61,9 @@ server { add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf; diff --git a/template/default-tmpl.blade.php b/template/default-tmpl.blade.php index 39afc80..416550c 100644 --- a/template/default-tmpl.blade.php +++ b/template/default-tmpl.blade.php @@ -61,9 +61,9 @@ add_header X-Frame-Options "SAMEORIGIN"; # basic H5BP suggestions + include h5bp/cross-origin/requests.conf; include h5bp/security/referrer-policy.conf; include h5bp/security/x-content-type-options.conf; - include h5bp/cross-origin/requests.conf; # performance enhancements (mostly for caching static data) include h5bp/web_performance/cache-file-descriptors.conf;