From d5c34785bc55164afb7cfe7de1badcebdb05fb8d Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Wed, 20 May 2015 15:51:28 +0300 Subject: 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. --- src/mail/ngx_mail.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/mail/ngx_mail.c') 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) -- cgit