diff options
| author | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-03 15:58:25 +0300 |
|---|---|---|
| committer | Maxim Dounin <mdounin@mdounin.ru> | 2016-10-03 15:58:25 +0300 |
| commit | 0a961a09171fc1de3f3a70aa6b15e29d3882f7f0 (patch) | |
| tree | 2121db4e34c3ed4d7512fb9d60bda49fb3fc7a43 /src/mail | |
| parent | a7f80ec354dd470a1da09585f8a74dd73d3ce883 (diff) | |
| download | nginx-0a961a09171fc1de3f3a70aa6b15e29d3882f7f0.tar.gz nginx-0a961a09171fc1de3f3a70aa6b15e29d3882f7f0.tar.bz2 | |
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.
Diffstat (limited to 'src/mail')
| -rw-r--r-- | src/mail/ngx_mail.c | 2 | ||||
| -rw-r--r-- | src/mail/ngx_mail.h | 2 | ||||
| -rw-r--r-- | src/mail/ngx_mail_core_module.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c index e5a77b05b..9e560bb7c 100644 --- a/src/mail/ngx_mail.c +++ b/src/mail/ngx_mail.c @@ -341,7 +341,7 @@ ngx_mail_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports) ls->keepcnt = addr[i].opt.tcp_keepcnt; #endif -#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) +#if (NGX_HAVE_INET6) ls->ipv6only = addr[i].opt.ipv6only; #endif diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h index 1068bb368..7c8422894 100644 --- a/src/mail/ngx_mail.h +++ b/src/mail/ngx_mail.h @@ -38,7 +38,7 @@ typedef struct { #if (NGX_MAIL_SSL) unsigned ssl:1; #endif -#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) +#if (NGX_HAVE_INET6) unsigned ipv6only:1; #endif unsigned so_keepalive:2; diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c index 48eacfa28..b974d905c 100644 --- a/src/mail/ngx_mail_core_module.c +++ b/src/mail/ngx_mail_core_module.c @@ -353,7 +353,7 @@ ngx_mail_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) ls->wildcard = u.wildcard; ls->ctx = cf->ctx; -#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) +#if (NGX_HAVE_INET6) ls->ipv6only = 1; #endif |