!62 update nginx to 1.23.2

From: @eaglegai 
Reviewed-by: @yaqiangchen 
Signed-off-by: @nlgwcy, @yaqiangchen
This commit is contained in:
openeuler-ci-bot 2022-11-16 02:16:40 +00:00 committed by Gitee
commit 0753a42ae5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
5 changed files with 12 additions and 10 deletions

View File

@ -16,5 +16,5 @@ Prevent dynamic modules from being enabled automatically
You may want to avoid dynamic modules being enabled automatically. Simply You may want to avoid dynamic modules being enabled automatically. Simply
remove this line from the top of /etc/nginx/nginx.conf: remove this line from the top of /etc/nginx/nginx.conf:
include /usr/lib64/nginx/modules/*.conf; include /usr/share/nginx/modules/*.conf;

Binary file not shown.

BIN
nginx-1.23.2.tar.gz Normal file

Binary file not shown.

View File

@ -4,7 +4,7 @@
user nginx; user nginx;
worker_processes auto; worker_processes auto;
error_log /var/log/nginx/error.log; error_log /var/log/nginx/error.log notice;
pid /run/nginx.pid; pid /run/nginx.pid;
# Load dynamic modules. See /usr/share/doc/nginx/README.dynamic. # Load dynamic modules. See /usr/share/doc/nginx/README.dynamic.
@ -23,7 +23,6 @@ http {
sendfile on; sendfile on;
tcp_nopush on; tcp_nopush on;
tcp_nodelay on;
keepalive_timeout 65; keepalive_timeout 65;
types_hash_max_size 4096; types_hash_max_size 4096;
@ -45,7 +44,7 @@ http {
include /etc/nginx/default.d/*.conf; include /etc/nginx/default.d/*.conf;
error_page 404 /404.html; error_page 404 /404.html;
location = /40x.html { location = /404.html {
} }
error_page 500 502 503 504 /50x.html; error_page 500 502 503 504 /50x.html;
@ -72,7 +71,7 @@ http {
# include /etc/nginx/default.d/*.conf; # include /etc/nginx/default.d/*.conf;
# #
# error_page 404 /404.html; # error_page 404 /404.html;
# location = /40x.html { # location = /404.html {
# } # }
# #
# error_page 500 502 503 504 /50x.html; # error_page 500 502 503 504 /50x.html;

View File

@ -13,8 +13,8 @@
Name: nginx Name: nginx
Epoch: 1 Epoch: 1
Version: 1.21.5 Version: 1.23.2
Release: 2 Release: 1
Summary: A HTTP server, reverse proxy and mail proxy server Summary: A HTTP server, reverse proxy and mail proxy server
License: BSD License: BSD
URL: http://nginx.org/ 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_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_secure_link_module --with-http_degradation_module --with-http_slice_module \
--with-http_perl_module=dynamic --with-http_auth_request_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-stream_ssl_module --with-google_perftools_module --with-debug \
--with-cc-opt="%{optflags} $(pcre2-config --cflags)" --with-ld-opt="$nginx_ldopts"; then --with-cc-opt="%{optflags} $(pcre2-config --cflags)" --with-ld-opt="$nginx_ldopts"; then
: configure failed : configure failed
@ -345,6 +345,9 @@ fi
%{_mandir}/man8/nginx.8* %{_mandir}/man8/nginx.8*
%changelog %changelog
* Mon Nov 14 2022 gaihuiying <eaglegai@163.com> - 1:1.23.2-1
- update nginx to 1.23.2
* Tue Jul 19 2022 gaihuiying <eaglegai@163.com> - 1:1.21.5-2 * Tue Jul 19 2022 gaihuiying <eaglegai@163.com> - 1:1.21.5-2
- switch pcre to pcre2 - switch pcre to pcre2