From deaf22d22083473ec3cdcd2dcfb2ea7c0fd62a3f Mon Sep 17 00:00:00 2001 From: Ruslan Ermilov Date: Mon, 30 Jul 2012 12:27:06 +0000 Subject: 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. --- src/core/ngx_connection.c | 4 ++-- src/core/ngx_connection.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/core') diff --git a/src/core/ngx_connection.c b/src/core/ngx_connection.c index ba1b3f9e2..660e0af4a 100644 --- a/src/core/ngx_connection.c +++ b/src/core/ngx_connection.c @@ -336,10 +336,10 @@ ngx_open_listening_sockets(ngx_cycle_t *cycle) #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 34af12e4f..87fd08723 100644 --- a/src/core/ngx_connection.h +++ b/src/core/ngx_connection.h @@ -64,7 +64,7 @@ struct ngx_listening_s { unsigned addr_ntop:1; #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) - unsigned ipv6only:2; + unsigned ipv6only:1; #endif unsigned keepalive:2; -- cgit