comparison src/mail/ngx_mail.c @ 6152:3c344ea7d88b

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Wed, 20 May 2015 15:51:28 +0300
parents 53bccdc4923a
children f61049c80458
comparison
equal deleted inserted replaced
6151:b4cc553aafeb 6152:3c344ea7d88b
390 return NGX_CONF_ERROR; 390 return NGX_CONF_ERROR;
391 } 391 }
392 392
393 ls->servers = mport; 393 ls->servers = mport;
394 394
395 if (i == last - 1) { 395 mport->naddrs = i + 1;
396 mport->naddrs = last;
397
398 } else {
399 mport->naddrs = 1;
400 i = 0;
401 }
402 396
403 switch (ls->sockaddr->sa_family) { 397 switch (ls->sockaddr->sa_family) {
404 #if (NGX_HAVE_INET6) 398 #if (NGX_HAVE_INET6)
405 case AF_INET6: 399 case AF_INET6:
406 if (ngx_mail_add_addrs6(cf, mport, addr) != NGX_OK) { 400 if (ngx_mail_add_addrs6(cf, mport, addr) != NGX_OK) {