mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-08-01 11:16:14 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

merge r3659, r3825, r3826:

Browse Source 
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:
Igor Sysoev 2010-12-14 19:19:07 +00:00
parent 772ecd6cc6
commit 217f8cea3a
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_cycle.c
View File

@ -847,7 +847,7 @@ ngx_cmp_sockaddr(struct sockaddr *sa1, struct sockaddr *sa2)
sin61 = (struct sockaddr_in6 *) sa1; sin61 = (struct sockaddr_in6 *) sa1;
sin62 = (struct sockaddr_in6 *) sa2; sin62 = (struct sockaddr_in6 *) sa2;
if (sin61->sin6_port != sin61->sin6_port) { if (sin61->sin6_port != sin62->sin6_port) {
return NGX_DECLINED; return NGX_DECLINED;
} }

8
src/http/ngx_http.c
View File

@ -1831,8 +1831,12 @@ ngx_http_add_addrs6(ngx_conf_t *cf, ngx_http_port_t *hport,
if (addr[i].hash.buckets == NULL if (addr[i].hash.buckets == NULL
&& (addr[i].wc_head == NULL && (addr[i].wc_head == NULL
|| addr[i].wc_head->hash.buckets == NULL) || addr[i].wc_head->hash.buckets == NULL)
&& (addr[i].wc_head == NULL && (addr[i].wc_tail == NULL
|| addr[i].wc_head->hash.buckets == NULL)) || addr[i].wc_tail->hash.buckets == NULL)
#if (NGX_PCRE)
&& addr[i].nregex == 0
#endif
)
{ {
continue; continue;
} }