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/http | |
| 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/http')
| -rw-r--r-- | src/http/ngx_http.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_core_module.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c index 7a46b3ecb..ba559f231 100644 --- a/src/http/ngx_http.c +++ b/src/http/ngx_http.c @@ -1756,7 +1756,7 @@ ngx_http_add_listening(ngx_conf_t *cf, ngx_http_conf_addr_t *addr) 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 e26c3f722..2daea1013 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -3939,7 +3939,7 @@ ngx_http_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) 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 a8013b184..fdd70041d 100644 --- a/src/http/ngx_http_core_module.h +++ b/src/http/ngx_http_core_module.h @@ -69,7 +69,7 @@ typedef struct { 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) |