mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-07-28 16:46:16 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merged with the default branch.

Browse Source
This commit is contained in:
Sergey Kandaurov 2023-01-02 17:10:22 +04:00
commit f5aa66bd30
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/nginx.h
View File

@ -9,8 +9,8 @@
#define _NGINX_H_INCLUDED_ #define _NGINX_H_INCLUDED_
#define nginx_version 1023003 #define nginx_version 1023004
#define NGINX_VERSION "1.23.3" #define NGINX_VERSION "1.23.4"
#define NGINX_VER "nginx/" NGINX_VERSION #define NGINX_VER "nginx/" NGINX_VERSION
#ifdef NGX_BUILD #ifdef NGX_BUILD

4
src/core/ngx_conf_file.c
View File

@ -544,8 +544,8 @@ ngx_conf_read_token(ngx_conf_t *cf)
} }
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
"unexpected end of file, " "unexpected end of file, "
"expecting \";\" or \"}\""); "expecting \";\" or \"}\"");
return NGX_ERROR; return NGX_ERROR;
} }

2
src/core/ngx_connection.c
View File

@ -656,7 +656,7 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle)
/* /*
* on OpenVZ after suspend/resume EADDRINUSE * on OpenVZ after suspend/resume EADDRINUSE
* may be returned by listen() instead of bind(), see * 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) { if (err != NGX_EADDRINUSE || !ngx_test_config) {

2
src/event/ngx_event_udp.c
View File

@ -81,7 +81,7 @@ ngx_event_recvmsg(ngx_event_t *ev)
msg.msg_controllen = sizeof(msg_control); msg.msg_controllen = sizeof(msg_control);
ngx_memzero(&msg_control, sizeof(msg_control)); ngx_memzero(&msg_control, sizeof(msg_control));
} }
#endif #endif
n = recvmsg(lc->fd, &msg, 0); n = recvmsg(lc->fd, &msg, 0);

2
src/event/quic/ngx_event_quic_udp.c
View File

@ -79,7 +79,7 @@ ngx_quic_recvmsg(ngx_event_t *ev)
msg.msg_controllen = sizeof(msg_control); msg.msg_controllen = sizeof(msg_control);
ngx_memzero(&msg_control, sizeof(msg_control)); ngx_memzero(&msg_control, sizeof(msg_control));
} }
#endif #endif
n = recvmsg(lc->fd, &msg, 0); n = recvmsg(lc->fd, &msg, 0);

2
src/http/ngx_http_core_module.c
View File

@ -4313,7 +4313,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen, 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) == NGX_OK)
{ {
goto next; goto next;

2
src/mail/ngx_mail_core_module.c
View File

@ -572,7 +572,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen, 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) == NGX_OK)
{ {
goto next; goto next;

2
src/os/unix/ngx_udp_sendmsg_chain.c
View File

@ -335,7 +335,7 @@ ngx_get_srcaddr_cmsg(struct cmsghdr *cmsg, struct sockaddr *local_sockaddr)
#endif #endif
#if (NGX_HAVE_IP_RECVDSTADDR) #if (NGX_HAVE_IP_RECVDSTADDR)
if (cmsg->cmsg_level == IPPROTO_IP if (cmsg->cmsg_level == IPPROTO_IP
&& cmsg->cmsg_type == IP_RECVDSTADDR && cmsg->cmsg_type == IP_RECVDSTADDR

2
src/stream/ngx_stream_core_module.c
View File

@ -919,7 +919,7 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
for (i = 0; i < n; i++) { for (i = 0; i < n; i++) {
if (ngx_cmp_sockaddr(u.addrs[n].sockaddr, u.addrs[n].socklen, 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) == NGX_OK)
{ {
goto next; goto next;