Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 4628:f675474435e0
Reverted previous attempt to fix complation warning introduced in
r4624 and actually fixed it.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Mon, 14 May 2012 15:52:37 +0000 |
parents | 3709ce127763 |
children | f39138a69e0a |
comparison
equal
deleted
inserted
replaced
4627:3152e4c371d7 | 4628:f675474435e0 |
---|---|
2711 #if (NGX_HAVE_INET6) | 2711 #if (NGX_HAVE_INET6) |
2712 ngx_uint_t n; | 2712 ngx_uint_t n; |
2713 struct in6_addr *inaddr6; | 2713 struct in6_addr *inaddr6; |
2714 #endif | 2714 #endif |
2715 | 2715 |
2716 #if (NGX_SUPPRESS_WARN) | |
2717 inaddr = NULL; | |
2718 #if (NGX_HAVE_INET6) | |
2719 inaddr6 = NULL; | |
2720 #endif | |
2721 #endif | |
2722 | |
2716 family = addr->sockaddr->sa_family; | 2723 family = addr->sockaddr->sa_family; |
2717 | 2724 |
2718 switch (family) { | 2725 if (family == AF_INET) { |
2726 inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; | |
2727 } | |
2719 | 2728 |
2720 #if (NGX_HAVE_INET6) | 2729 #if (NGX_HAVE_INET6) |
2721 case AF_INET6: | 2730 else if (family == AF_INET6) { |
2722 inaddr6 = &((struct sockaddr_in6 *) addr->sockaddr)->sin6_addr; | 2731 inaddr6 = &((struct sockaddr_in6 *) addr->sockaddr)->sin6_addr; |
2723 | 2732 |
2724 if (IN6_IS_ADDR_V4MAPPED(inaddr6)) { | 2733 if (IN6_IS_ADDR_V4MAPPED(inaddr6)) { |
2725 family = AF_INET; | 2734 family = AF_INET; |
2726 inaddr = (in_addr_t *) &inaddr6->s6_addr[12]; | 2735 inaddr = (in_addr_t *) &inaddr6->s6_addr[12]; |
2727 } | 2736 } |
2728 | 2737 } |
2729 break; | 2738 #endif |
2730 #endif | |
2731 | |
2732 #if (NGX_HAVE_UNIX_DOMAIN) | |
2733 case AF_UNIX: | |
2734 break; | |
2735 #endif | |
2736 | |
2737 default: /* AF_INET */ | |
2738 inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; | |
2739 } | |
2740 | 2739 |
2741 for (cidr = proxies->elts, i = 0; i < proxies->nelts; i++) { | 2740 for (cidr = proxies->elts, i = 0; i < proxies->nelts; i++) { |
2742 if (cidr[i].family != family) { | 2741 if (cidr[i].family != family) { |
2743 goto next; | 2742 goto next; |
2744 } | 2743 } |