Mercurial > hg > nginx-vendor-current

comparison src/core/ngx_connection.c @ 682:5cb5db9975ba NGINX_1_3_4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 1.3.4 *) Change: the "ipv6only" parameter is now turned on by default for listening IPv6 sockets. *) Feature: the Clang compiler support. *) Bugfix: extra listening sockets might be created. Thanks to Roman Odaisky. *) Bugfix: nginx/Windows might hog CPU if a worker process failed to start. Thanks to Ricardo Villalobos Guevara. *) Bugfix: the "proxy_pass_header", "fastcgi_pass_header", "scgi_pass_header", "uwsgi_pass_header", "proxy_hide_header", "fastcgi_hide_header", "scgi_hide_header", and "uwsgi_hide_header" directives might be inherited incorrectly.
author Igor Sysoev <http://sysoev.ru>
date Tue, 31 Jul 2012 00:00:00 +0400
parents ad45b044f1e5
children 6db6e93f55ee
comparison
equal deleted inserted replaced
681:625501f84a6b 682:5cb5db9975ba
334 return NGX_ERROR; 334 return NGX_ERROR;
335 } 335 }
336 336
337 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) 337 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY)
338 338
339 if (ls[i].sockaddr->sa_family == AF_INET6 && ls[i].ipv6only) { 339 if (ls[i].sockaddr->sa_family == AF_INET6) {
340 int ipv6only; 340 int ipv6only;
341 341
342 ipv6only = (ls[i].ipv6only == 1); 342 ipv6only = ls[i].ipv6only;
343 343
344 if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY, 344 if (setsockopt(s, IPPROTO_IPV6, IPV6_V6ONLY,
345 (const void *) &ipv6only, sizeof(int)) 345 (const void *) &ipv6only, sizeof(int))
346 == -1) 346 == -1)
347 { 347 {