comparison src/stream/ngx_stream.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 ea9dfe2f62e7
children f41c2530dd17
comparison
equal deleted inserted replaced
6718:bdf64ae3376b 6719:cebf5fed00bf
504 ls->keepidle = addr[i].opt.tcp_keepidle; 504 ls->keepidle = addr[i].opt.tcp_keepidle;
505 ls->keepintvl = addr[i].opt.tcp_keepintvl; 505 ls->keepintvl = addr[i].opt.tcp_keepintvl;
506 ls->keepcnt = addr[i].opt.tcp_keepcnt; 506 ls->keepcnt = addr[i].opt.tcp_keepcnt;
507 #endif 507 #endif
508 508
509 #if (NGX_HAVE_INET6 && defined IPV6_V6ONLY) 509 #if (NGX_HAVE_INET6)
510 ls->ipv6only = addr[i].opt.ipv6only; 510 ls->ipv6only = addr[i].opt.ipv6only;
511 #endif 511 #endif
512 512
513 #if (NGX_HAVE_REUSEPORT) 513 #if (NGX_HAVE_REUSEPORT)
514 ls->reuseport = addr[i].opt.reuseport; 514 ls->reuseport = addr[i].opt.reuseport;