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/stream/ngx_stream_core_module.c | |
parent | a7f80ec354dd470a1da09585f8a74dd73d3ce883 (diff) | |
download | nginx-0a961a09171fc1de3f3a70aa6b15e29d3882f7f0.tar.gz nginx-0a961a09171fc1de3f3a70aa6b15e29d3882f7f0.zip |
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/stream/ngx_stream_core_module.c')
-rw-r--r-- | src/stream/ngx_stream_core_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
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 |