diff --git a/src/core/ngx_conf_file.c b/src/core/ngx_conf_file.c index fec7bb8..197704b 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/core/ngx_connection.c b/src/core/ngx_connection.c index cbd5803..57c5a8a 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -656,7 +656,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) { diff --git a/src/event/ngx_event_udp.c b/src/event/ngx_event_udp.c index a7fa38a..ec86fdf 100644 --- a/src/event/ngx_event_udp.c +++ b/src/event/ngx_event_udp.c @@ -81,7 +81,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/event/quic/ngx_event_quic_udp.c b/src/event/quic/ngx_event_quic_udp.c index db63773..f7253a2 100644 --- a/src/event/quic/ngx_event_quic_udp.c +++ b/src/event/quic/ngx_event_quic_udp.c @@ -79,7 +79,7 @@ ngx_quic_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/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index e988a4c..21966e6 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -4313,7 +4313,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 75a2155..487c5de 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/os/unix/ngx_udp_sendmsg_chain.c b/src/os/unix/ngx_udp_sendmsg_chain.c index e9e6f70..fa917b5 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 diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c index b0d297c..9be1a71 100644 --- a/src/stream/ngx_stream_core_module.c +++ b/src/stream/ngx_stream_core_module.c @@ -919,7 +919,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;