merge r3659, r3825, r3826:
IPv6 related fixes: *) fix IPv6 listen socket handling while reconfiguring *) test wildcard tail hash existance for IPv6 addresses, the same fix for IPv4 addresses has been made in r2581 *) always run regex in server_name to get captures for IPv6 addresses, the same fix for IPv4 addresses has been made in r2584
This commit is contained in:
parent
95c86bc8b4
commit
aad4528125
|
@ -847,7 +847,7 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, struct sockaddr *sa2)
|
|||
sin61 = (struct sockaddr_in6 *) sa1;
|
||||
sin62 = (struct sockaddr_in6 *) sa2;
|
||||
|
||||
if (sin61->sin6_port != sin61->sin6_port) {
|
||||
if (sin61->sin6_port != sin62->sin6_port) {
|
||||
return NGX_DECLINED;
|
||||
}
|
||||
|
||||
|
|
|
@ -1831,8 +1831,12 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
|
|||
if (addr[i].hash.buckets == NULL
|
||||
&& (addr[i].wc_head == NULL
|
||||
|| addr[i].wc_head->hash.buckets == NULL)
|
||||
&& (addr[i].wc_head == NULL
|
||||
|| addr[i].wc_head->hash.buckets == NULL))
|
||||
&& (addr[i].wc_tail == NULL
|
||||
|| addr[i].wc_tail->hash.buckets == NULL)
|
||||
#if (NGX_PCRE)
|
||||
&& addr[i].nregex == 0
|
||||
#endif
|
||||
)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue