diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2015-05-20 15:51:28 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2015-05-20 15:51:28 +0300 |
| commit | d5c34785bc55164afb7cfe7de1badcebdb05fb8d (patch) | |
| tree | ac8c4605212157ee2f5b09bc4c053d04bb569ede /src | |
| parent | 68b3d28c55e8c24c9998a4292b40c4fbe4afc36f (diff) | |
| download | nginx-d5c34785bc55164afb7cfe7de1badcebdb05fb8d.tar.gz nginx-d5c34785bc55164afb7cfe7de1badcebdb05fb8d.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http.c | 8 | ||||
| -rw-r--r-- | src/mail/ngx_mail.c | 8 | ||||
| -rw-r--r-- | src/stream/ngx_stream.c | 8 |
3 files changed, 3 insertions, 21 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 924c4b548..adb4b6f36 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -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) { diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c index 48ce28617..f10f08c5f 100644 --- a/src/mail/ngx_mail.c +++ b/src/mail/ngx_mail.c @@ -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) diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c index e5ffcf9bc..18aea28af 100644 --- a/src/stream/ngx_stream.c +++ b/src/stream/ngx_stream.c @@ -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) |