From 0a961a09171fc1de3f3a70aa6b15e29d3882f7f0 Mon Sep 17 00:00:00 2001 From: Maxim Dounin Date: Mon, 3 Oct 2016 15:58:25 +0300 Subject: 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. --- src/stream/ngx_stream_core_module.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/stream/ngx_stream_core_module.c') diff --git a/src/stream/ngx_stream_core_module.c b/src/stream/ngx_stream_core_module.c index 23644f3d2..f7870eed5 100644 --- a/src/stream/ngx_stream_core_module.c +++ b/src/stream/ngx_stream_core_module.c @@ -624,7 +624,7 @@ ngx_stream_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 -- cgit v1.2.3