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.
diff --git a/src/core/ngx_connection.h b/src/core/ngx_connection.h
index e484c81..d9ee685 100644
--- a/src/core/ngx_connection.h
+++ b/src/core/ngx_connection.h
@@ -66,7 +66,7 @@
unsigned addr_ntop:1;
unsigned wildcard:1;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
unsigned ipv6only:1;
#endif
#if (NGX_HAVE_REUSEPORT)
diff --git a/src/core/ngx_module.h b/src/core/ngx_module.h
index e2fbe9c..4ddab56 100644
--- a/src/core/ngx_module.h
+++ b/src/core/ngx_module.h
@@ -71,11 +71,7 @@
#define NGX_MODULE_SIGNATURE_8 "0"
#endif
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
#define NGX_MODULE_SIGNATURE_9 "1"
-#else
-#define NGX_MODULE_SIGNATURE_9 "0"
-#endif
#if (NGX_HAVE_REUSEPORT)
#define NGX_MODULE_SIGNATURE_10 "1"
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 7a46b3e..ba559f2 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -1756,7 +1756,7 @@
ls->deferred_accept = addr->opt.deferred_accept;
#endif
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
ls->ipv6only = addr->opt.ipv6only;
#endif
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index e26c3f7..2daea10 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3939,7 +3939,7 @@
lsopt.fastopen = -1;
#endif
lsopt.wildcard = u.wildcard;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
lsopt.ipv6only = 1;
#endif
diff --git a/src/http/ngx_http_core_module.h b/src/http/ngx_http_core_module.h
index a8013b1..fdd7004 100644
--- a/src/http/ngx_http_core_module.h
+++ b/src/http/ngx_http_core_module.h
@@ -69,7 +69,7 @@
unsigned ssl:1;
#endif
unsigned http2:1;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
unsigned ipv6only:1;
#endif
#if (NGX_HAVE_REUSEPORT)
diff --git a/src/mail/ngx_mail.c b/src/mail/ngx_mail.c
index e5a77b0..9e560bb 100644
--- a/src/mail/ngx_mail.c
+++ b/src/mail/ngx_mail.c
@@ -341,7 +341,7 @@
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 1068bb3..7c84228 100644
--- a/src/mail/ngx_mail.h
+++ b/src/mail/ngx_mail.h
@@ -38,7 +38,7 @@
#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 48eacfa..b974d90 100644
--- a/src/mail/ngx_mail_core_module.c
+++ b/src/mail/ngx_mail_core_module.c
@@ -353,7 +353,7 @@
ls->wildcard = u.wildcard;
ls->ctx = cf->ctx;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
ls->ipv6only = 1;
#endif
diff --git a/src/stream/ngx_stream.c b/src/stream/ngx_stream.c
index 7312c3e..b982c1f 100644
--- a/src/stream/ngx_stream.c
+++ b/src/stream/ngx_stream.c
@@ -506,7 +506,7 @@
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/stream/ngx_stream.h b/src/stream/ngx_stream.h
index a2644a7..7cb8ae3 100644
--- a/src/stream/ngx_stream.h
+++ b/src/stream/ngx_stream.h
@@ -52,7 +52,7 @@
#if (NGX_STREAM_SSL)
unsigned ssl:1;
#endif
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
unsigned ipv6only:1;
#endif
#if (NGX_HAVE_REUSEPORT)
diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c
index 23644f3..f7870ee 100644
--- a/src/stream/ngx_stream_core_module.c
+++ b/src/stream/ngx_stream_core_module.c
@@ -624,7 +624,7 @@
ls->wildcard = u.wildcard;
ls->ctx = cf->ctx;
-#if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
+#if (NGX_HAVE_INET6)
ls->ipv6only = 1;
#endif
