mirror of
https://github.com/nginx/nginx.git
synced 2025-06-06 00:42:40 +08:00
Simplified ngx_http_init_listening().
There is no need to set "i" to 0, as it's expected to be 0 assuming the bindings are properly sorted, and we already rely on this when explicitly set hport->naddrs to 1. Remaining conditional code is replaced with identical "hport->naddrs = i + 1". Identical modifications are done in the mail and stream modules, in the ngx_mail_optimize_servers() and ngx_stream_optimize_servers() functions, respectively. No functional changes.
This commit is contained in:
parent
68b3d28c55
commit
d5c34785bc
@ -1719,13 +1719,7 @@ ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_port_t *port)
|
||||
|
||||
ls->servers = hport;
|
||||
|
||||
if (i == last - 1) {
|
||||
hport->naddrs = last;
|
||||
|
||||
} else {
|
||||
hport->naddrs = 1;
|
||||
i = 0;
|
||||
}
|
||||
hport->naddrs = i + 1;
|
||||
|
||||
switch (ls->sockaddr->sa_family) {
|
||||
|
||||
|
@ -392,13 +392,7 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
|
||||
|
||||
ls->servers = mport;
|
||||
|
||||
if (i == last - 1) {
|
||||
mport->naddrs = last;
|
||||
|
||||
} else {
|
||||
mport->naddrs = 1;
|
||||
i = 0;
|
||||
}
|
||||
mport->naddrs = i + 1;
|
||||
|
||||
switch (ls->sockaddr->sa_family) {
|
||||
#if (NGX_HAVE_INET6)
|
||||
|
@ -393,13 +393,7 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
|
||||
|
||||
ls->servers = stport;
|
||||
|
||||
if (i == last - 1) {
|
||||
stport->naddrs = last;
|
||||
|
||||
} else {
|
||||
stport->naddrs = 1;
|
||||
i = 0;
|
||||
}
|
||||
stport->naddrs = i + 1;
|
||||
|
||||
switch (ls->sockaddr->sa_family) {
|
||||
#if (NGX_HAVE_INET6)
|
||||
|
Loading…
Reference in New Issue
Block a user