aboutsummaryrefslogtreecommitdiff
path: root/src/core/ngx_connection.c
diff options
context:
space:
mode:
authorRuslan Ermilov <ru@nginx.com>2012-07-30 12:27:06 +0000
committerRuslan Ermilov <ru@nginx.com>2012-07-30 12:27:06 +0000
commitdeaf22d22083473ec3cdcd2dcfb2ea7c0fd62a3f (patch)
treeacf6297d9229f9b2c0da4bfb9a918912096aa2ba /src/core/ngx_connection.c
parent9c8f3d86b4c4c1bb04057e57f798e4244cefcbcf (diff)
downloadnginx-deaf22d22083473ec3cdcd2dcfb2ea7c0fd62a3f.tar.gz
nginx-deaf22d22083473ec3cdcd2dcfb2ea7c0fd62a3f.zip
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.
Diffstat (limited to 'src/core/ngx_connection.c')
-rw-r--r--src/core/ngx_connection.c4
1 files changed, 2 insertions, 2 deletions
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))