comparison src/http/ngx_http_core_module.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 b802b7e1d9bc
children 0c572ed91b36
comparison
equal deleted inserted replaced
6718:bdf64ae3376b 6719:cebf5fed00bf
3937 #endif 3937 #endif
3938 #if (NGX_HAVE_TCP_FASTOPEN) 3938 #if (NGX_HAVE_TCP_FASTOPEN)
3939 lsopt.fastopen = -1; 3939 lsopt.fastopen = -1;
3940 #endif 3940 #endif
3941 lsopt.wildcard = u.wildcard; 3941 lsopt.wildcard = u.wildcard;
3942 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) 3942 #if (NGX_HAVE_INET6)
3943 lsopt.ipv6only = 1; 3943 lsopt.ipv6only = 1;
3944 #endif 3944 #endif
3945 3945
3946 (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr, 3946 (void) ngx_sock_ntop(&lsopt.sockaddr.sockaddr, lsopt.socklen, lsopt.addr,
3947 NGX_SOCKADDR_STRLEN, 1); 3947 NGX_SOCKADDR_STRLEN, 1);