From: Ruslan Ermilov Date: Mon, 14 May 2012 13:15:22 +0000 (+0000) Subject: Fixed compilation warning introduced in r4624. X-Git-Tag: release-1.3.0~7 X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=11a8e26d29d6f6837f4c365766ebb2ec94efc428;p=nginx.git Fixed compilation warning introduced in r4624. --- diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 319a0781d..1aef755a1 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2715,21 +2715,29 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr, family = addr->sockaddr->sa_family; - if (family == AF_INET) { - inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; - } + switch (family) { #if (NGX_HAVE_INET6) - else if (family == AF_INET6) { + case AF_INET6: inaddr6 = &((struct sockaddr_in6 *) addr->sockaddr)->sin6_addr; if (IN6_IS_ADDR_V4MAPPED(inaddr6)) { family = AF_INET; inaddr = (in_addr_t *) &inaddr6->s6_addr[12]; } - } + + break; +#endif + +#if (NGX_HAVE_UNIX_DOMAIN) + case AF_UNIX: + break; #endif + default: /* AF_INET */ + inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; + } + for (cidr = proxies->elts, i = 0; i < proxies->nelts; i++) { if (cidr[i].family != family) { goto next;