diff --git a/nginx-1.26.1.tar.gz b/nginx-1.26.1.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..8a7ea244e015310e893555a1f68d08052821fb62 Binary files /dev/null and b/nginx-1.26.1.tar.gz differ diff --git a/nginx.conf b/nginx.conf index 8839c1194994b9d413c23a8f0730db2fbef6ecd5..e9fa98d6bf005659d030b4bbd29ee2eec82f89e9 100644 --- a/nginx.conf +++ b/nginx.conf @@ -42,21 +42,14 @@ http { # Load configuration files for the default server block. include /etc/nginx/default.d/*.conf; - - error_page 404 /404.html; - location = /404.html { - } - - error_page 500 502 503 504 /50x.html; - location = /50x.html { - } } # Settings for a TLS enabled server. # # server { -# listen 443 ssl http2; -# listen [::]:443 ssl http2; +# listen 443 ssl; +# listen [::]:443 ssl; +# http2 on; # server_name _; # root /usr/share/nginx/html; # @@ -69,14 +62,6 @@ http { # # # Load configuration files for the default server block. # include /etc/nginx/default.d/*.conf; -# -# error_page 404 /404.html; -# location = /404.html { -# } -# -# error_page 500 502 503 504 /50x.html; -# location = /50x.html { -# } # } } diff --git a/nginx.spec b/nginx.spec index ba6107f663d516ec55b7b899463bf85c9a18829c..e174b709e0a6ecf70eeb0e6f0086cb60895362bb 100644 --- a/nginx.spec +++ b/nginx.spec @@ -1,4 +1,4 @@ -%define anolis_release 2 +%define anolis_release 1 %global _hardened_build 1 %global nginx_user nginx @@ -27,7 +27,7 @@ Name: nginx Epoch: 1 -Version: 1.24.0 +Version: 1.26.1 Release: %{anolis_release}%{?dist} Summary: A high performance web server and reverse proxy server @@ -684,6 +684,9 @@ fi %doc CHANGES README README.dynamic %changelog +* Thu Jul 04 2024 mgb01105731 - 1:1.26.1-1 +- update to 1.26.1 + * Wed Apr 12 2023 Xuchun Shang 1:1.24.0-2 - Update some description and add abi file