Core: ipv6only is now on by default.
There is a general consensus that this change results in better
consistency between different operating systems and differently
tuned operating systems.
Note: this changes the width and meaning of the ipv6only field
of the ngx_listening_t structure. 3rd party modules that create
their own listening sockets might need fixing.
diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c
index ba1b3f9..660e0af 100644
--- a/src/core/ngx_connection.c
+++ b/src/core/ngx_connection.c
@@ -336,10 +336,10 @@
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
- if (ls[i].sockaddr->sa_family == AF_INET6 && ls[i].ipv6only) {
+ if (ls[i].sockaddr->sa_family == AF_INET6) {
int ipv6only;
- ipv6only = (ls[i].ipv6only == 1);
+ ipv6only = ls[i].ipv6only;
if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
(const void *) &ipv6only, sizeof(int))
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index 34af12e..87fd087 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -64,7 +64,7 @@
unsigned addr_ntop:1;
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
- unsigned ipv6only:2;
+ unsigned ipv6only:1;
#endif
unsigned keepalive:2;
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index ecc0a2f..14dc2ce 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3912,6 +3912,9 @@
lsopt.setfib = -1;
#endif
lsopt.wildcard = u.wildcard;
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+ lsopt.ipv6only = 1;
+#endif
(void) ngx_sock_ntop(&lsopt.u.sockaddr, lsopt.addr,
NGX_SOCKADDR_STRLEN, 1);
@@ -4031,7 +4034,7 @@
lsopt.ipv6only = 1;
} else if (ngx_strcmp(&value[n].data[10], "ff") == 0) {
- lsopt.ipv6only = 2;
+ lsopt.ipv6only = 0;
} else {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index b11bdcd..ff1c2df 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -76,7 +76,7 @@
unsigned ssl:1;
#endif
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
- unsigned ipv6only:2;
+ unsigned ipv6only:1;
#endif
unsigned so_keepalive:2;
diff --git a/src/mail/ngx_mail.h b/src/mail/ngx_mail.h
index 1fceb42..ccdfb8c 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -39,7 +39,7 @@
unsigned ssl:1;
#endif
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
- unsigned ipv6only:2;
+ unsigned ipv6only:1;
#endif
unsigned so_keepalive:2;
#if (NGX_HAVE_KEEPALIVE_TUNABLE)
@@ -100,7 +100,7 @@
unsigned ssl:1;
#endif
#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
- unsigned ipv6only:2;
+ unsigned ipv6only:1;
#endif
unsigned so_keepalive:2;
#if (NGX_HAVE_KEEPALIVE_TUNABLE)
diff --git a/src/mail/ngx_mail_core_module.c b/src/mail/ngx_mail_core_module.c
index f79913b..f0dee72 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -374,6 +374,10 @@
ls->wildcard = u.wildcard;
ls->ctx = cf->ctx;
+#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+ ls->ipv6only = 1;
+#endif
+
for (m = 0; ngx_modules[m]; m++) {
if (ngx_modules[m]->type != NGX_MAIL_MODULE) {
continue;
@@ -413,7 +417,7 @@
ls->ipv6only = 1;
} else if (ngx_strcmp(&value[i].data[10], "ff") == 0) {
- ls->ipv6only = 2;
+ ls->ipv6only = 0;
} else {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,