comparison src/http/ngx_http.c @ 6719:cebf5fed00bf

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.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 03 Oct 2016 15:58:25 +0300
parents b3b7e33083ac
children 666b2bea3cb9
comparison
equal deleted inserted replaced
6718:bdf64ae3376b 6719:cebf5fed00bf
1754 1754
1755 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT) 1755 #if (NGX_HAVE_DEFERRED_ACCEPT && defined TCP_DEFER_ACCEPT)
1756 ls->deferred_accept = addr->opt.deferred_accept; 1756 ls->deferred_accept = addr->opt.deferred_accept;
1757 #endif 1757 #endif
1758 1758
1759 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) 1759 #if (NGX_HAVE_INET6)
1760 ls->ipv6only = addr->opt.ipv6only; 1760 ls->ipv6only = addr->opt.ipv6only;
1761 #endif 1761 #endif
1762 1762
1763 #if (NGX_HAVE_SETFIB) 1763 #if (NGX_HAVE_SETFIB)
1764 ls->setfib = addr->opt.setfib; 1764 ls->setfib = addr->opt.setfib;