diff --git a/README.dynamic b/README.dynamic index 59f03f62643d44b1a87183c89791096705fbb7b9..575885892d15e923e2d3ed69abf3419214f26d25 100644 --- a/README.dynamic +++ b/README.dynamic @@ -16,5 +16,5 @@ Prevent dynamic modules from being enabled automatically You may want to avoid dynamic modules being enabled automatically. Simply remove this line from the top of /etc/nginx/nginx.conf: - include /usr/lib64/nginx/modules/*.conf; + include /usr/share/nginx/modules/*.conf; diff --git a/nginx-1.21.5.tar.gz b/nginx-1.21.5.tar.gz deleted file mode 100644 index 207d55ca58ce3176bf02c79d043b5b32dd2a5ac1..0000000000000000000000000000000000000000 Binary files a/nginx-1.21.5.tar.gz and /dev/null differ diff --git a/nginx-1.23.2.tar.gz b/nginx-1.23.2.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..26b73009e81fc259ef27d047a2db5137b00da906 Binary files /dev/null and b/nginx-1.23.2.tar.gz differ diff --git a/nginx.conf b/nginx.conf index f85920a863387006605204bf4676c32a7a1464ec..8839c1194994b9d413c23a8f0730db2fbef6ecd5 100644 --- a/nginx.conf +++ b/nginx.conf @@ -4,7 +4,7 @@ user nginx; worker_processes auto; -error_log /var/log/nginx/error.log; +error_log /var/log/nginx/error.log notice; pid /run/nginx.pid; # Load dynamic modules. See /usr/share/doc/nginx/README.dynamic. @@ -23,7 +23,6 @@ http { sendfile on; tcp_nopush on; - tcp_nodelay on; keepalive_timeout 65; types_hash_max_size 4096; @@ -45,11 +44,11 @@ http { include /etc/nginx/default.d/*.conf; error_page 404 /404.html; - location = /40x.html { + location = /404.html { } error_page 500 502 503 504 /50x.html; - location = /50x.html { + location = /50x.html { } } @@ -72,11 +71,11 @@ http { # include /etc/nginx/default.d/*.conf; # # error_page 404 /404.html; -# location = /40x.html { +# location = /404.html { # } # # error_page 500 502 503 504 /50x.html; -# location = /50x.html { +# location = /50x.html { # } # } diff --git a/nginx.spec b/nginx.spec index ec3e627216cfec5ba006cab357315d621dd9964e..f89816c0ecbf730f179f320b48b185d9807e42ac 100644 --- a/nginx.spec +++ b/nginx.spec @@ -13,8 +13,8 @@ Name: nginx Epoch: 1 -Version: 1.21.5 -Release: 2 +Version: 1.23.2 +Release: 1 Summary: A HTTP server, reverse proxy and mail proxy server License: BSD URL: http://nginx.org/ @@ -160,7 +160,7 @@ if ! ./configure \ --with-http_gunzip_module --with-http_gzip_static_module --with-http_random_index_module \ --with-http_secure_link_module --with-http_degradation_module --with-http_slice_module \ --with-http_perl_module=dynamic --with-http_auth_request_module \ - --with-mail=dynamic --with-mail_ssl_module --with-pcre --with-pcre-jit --with-stream=dynamic \ + --with-mail=dynamic --with-mail_ssl_module --with-openssl-opt=yes --with-pcre --with-pcre-jit --with-stream=dynamic \ --with-stream_ssl_module --with-google_perftools_module --with-debug \ --with-cc-opt="%{optflags} $(pcre2-config --cflags)" --with-ld-opt="$nginx_ldopts"; then : configure failed @@ -345,6 +345,9 @@ fi %{_mandir}/man8/nginx.8* %changelog +* Mon Nov 14 2022 gaihuiying - 1:1.23.2-1 +- update nginx to 1.23.2 + * Tue Jul 19 2022 gaihuiying - 1:1.21.5-2 - switch pcre to pcre2