Mercurial > hg > nginx
comparison src/mail/ngx_mail.c @ 6719:cebf5fed00bf
Modules compatibility: removed unneeded IPV6_V6ONLY checks.
The IPV6_V6ONLY macro is now checked only while parsing appropriate flag
and when using the macro.
The ipv6only field in listen structures is always initialized to 1,
even if not supported on a given platform. This is expected to prevent
a module compiled without IPV6_V6ONLY from accidentally creating dual
sockets if loaded into main binary with proper IPV6_V6ONLY support.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Mon, 03 Oct 2016 15:58:25 +0300 |
| parents | b3b7e33083ac |
| children | 6c13008ad503 |
comparison
equal
deleted
inserted
replaced
| 6718:bdf64ae3376b | 6719:cebf5fed00bf |
|---|---|
| 339 ls->keepidle = addr[i].opt.tcp_keepidle; | 339 ls->keepidle = addr[i].opt.tcp_keepidle; |
| 340 ls->keepintvl = addr[i].opt.tcp_keepintvl; | 340 ls->keepintvl = addr[i].opt.tcp_keepintvl; |
| 341 ls->keepcnt = addr[i].opt.tcp_keepcnt; | 341 ls->keepcnt = addr[i].opt.tcp_keepcnt; |
| 342 #endif | 342 #endif |
| 343 | 343 |
| 344 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) | 344 #if (NGX_HAVE_INET6) |
| 345 ls->ipv6only = addr[i].opt.ipv6only; | 345 ls->ipv6only = addr[i].opt.ipv6only; |
| 346 #endif | 346 #endif |
| 347 | 347 |
| 348 mport = ngx_palloc(cf->pool, sizeof(ngx_mail_port_t)); | 348 mport = ngx_palloc(cf->pool, sizeof(ngx_mail_port_t)); |
| 349 if (mport == NULL) { | 349 if (mport == NULL) { |