From bf5dcc3fb23d9ab488236cb08418e58ff881c598 Mon Sep 17 00:00:00 2001 From: Sergey Kandaurov Date: Fri, 16 Dec 2022 01:15:13 +0400 Subject: [PATCH 1/4] Version bump. --- src/core/nginx.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/nginx.h b/src/core/nginx.h index f4e9d7c91..f26c6181a 100644 --- a/src/core/nginx.h +++ b/src/core/nginx.h @@ -9,8 +9,8 @@ #define _NGINX_H_INCLUDED_ -#define nginx_version 1023003 -#define NGINX_VERSION "1.23.3" +#define nginx_version 1023004 +#define NGINX_VERSION "1.23.4" #define NGINX_VER "nginx/" NGINX_VERSION #ifdef NGX_BUILD From 95133893f9821fd08619d5d2af71ea2c3345f095 Mon Sep 17 00:00:00 2001 From: BullerDu Date: Fri, 16 Dec 2022 01:15:15 +0400 Subject: [PATCH 2/4] Style. --- src/core/ngx_conf_file.c | 4 ++-- src/event/ngx_event_udp.c | 2 +- src/os/unix/ngx_udp_sendmsg_chain.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index fec7bb83a..197704b0f 100644 --- a/src/core/ngx_conf_file.c +++ b/src/core/ngx_conf_file.c @@ -544,8 +544,8 @@ ngx_conf_read_token(ngx_conf_t *cf) } ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "unexpected end of file, " - "expecting \";\" or \"}\""); + "unexpected end of file, " + "expecting \";\" or \"}\""); return NGX_ERROR; } diff --git a/src/event/ngx_event_udp.c b/src/event/ngx_event_udp.c index 1ac82c7f5..d7a94c76e 100644 --- a/src/event/ngx_event_udp.c +++ b/src/event/ngx_event_udp.c @@ -88,7 +88,7 @@ ngx_event_recvmsg(ngx_event_t *ev) msg.msg_controllen = sizeof(msg_control); ngx_memzero(&msg_control, sizeof(msg_control)); - } + } #endif n = recvmsg(lc->fd, &msg, 0); diff --git a/src/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c index e9e6f7091..fa917b569 100644 --- a/src/os/unix/ngx_udp_sendmsg_chain.c +++ b/src/os/unix/ngx_udp_sendmsg_chain.c @@ -335,7 +335,7 @@ ngx_get_srcaddr_cmsg(struct cmsghdr *cmsg, struct sockaddr *local_sockaddr) #endif - #if (NGX_HAVE_IP_RECVDSTADDR) +#if (NGX_HAVE_IP_RECVDSTADDR) if (cmsg->cmsg_level == IPPROTO_IP && cmsg->cmsg_type == IP_RECVDSTADDR From 641368249c319a833a7d9c4256cd9fd1b3e29a39 Mon Sep 17 00:00:00 2001 From: Valentin Bartenev Date: Sun, 18 Dec 2022 21:29:02 +0300 Subject: [PATCH 3/4] Fixed port ranges support in the listen directive. Ports difference must be respected when checking addresses for duplicates, otherwise configurations like this are broken: listen 127.0.0.1:6000-6005 It was broken by 4cc2bfeff46c (nginx 1.23.3). --- src/http/ngx_http_core_module.c | 2 +- src/mail/ngx_mail_core_module.c | 2 +- src/stream/ngx_stream_core_module.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 2647e7cd0..6b1cb4fa4 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -4292,7 +4292,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) for (i = 0; i < n; i++) { if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen, - u.addrs[i].sockaddr, u.addrs[i].socklen, 0) + u.addrs[i].sockaddr, u.addrs[i].socklen, 1) == NGX_OK) { goto next; diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c index 75a2155db..487c5de8d 100644 --- a/src/mail/ngx_mail_core_module.c +++ b/src/mail/ngx_mail_core_module.c @@ -572,7 +572,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) for (i = 0; i < n; i++) { if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen, - u.addrs[i].sockaddr, u.addrs[i].socklen, 0) + u.addrs[i].sockaddr, u.addrs[i].socklen, 1) == NGX_OK) { goto next; diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c index 4be848570..f0b79341d 100644 --- a/src/stream/ngx_stream_core_module.c +++ b/src/stream/ngx_stream_core_module.c @@ -890,7 +890,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) for (i = 0; i < n; i++) { if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen, - u.addrs[i].sockaddr, u.addrs[i].socklen, 0) + u.addrs[i].sockaddr, u.addrs[i].socklen, 1) == NGX_OK) { goto next; From 9c7a2c7ce4ad02a36df1bb0ee5e40a84610fffb9 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 21 Dec 2022 14:53:27 +0300 Subject: [PATCH 4/4] Updated link to OpenVZ suspend/resume bug. --- src/core/ngx_connection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index fe729a78a..36823451a 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -660,7 +660,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) /* * on OpenVZ after suspend/resume EADDRINUSE * may be returned by listen() instead of bind(), see - * https://bugzilla.openvz.org/show_bug.cgi?id=2470 + * https://bugs.openvz.org/browse/OVZ-5587 */ if (err != NGX_EADDRINUSE || !ngx_test_config) {