Mercurial > hg > nginx
changeset 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 | 3152e4c371d7 |
children | e813c113ef19 |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 12 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -2713,31 +2713,30 @@ ngx_http_get_forwarded_addr(ngx_http_req struct in6_addr *inaddr6; #endif +#if (NGX_SUPPRESS_WARN) + inaddr = NULL; +#if (NGX_HAVE_INET6) + inaddr6 = NULL; +#endif +#endif + family = addr->sockaddr->sa_family; - switch (family) { + if (family == AF_INET) { + inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; + } #if (NGX_HAVE_INET6) - case AF_INET6: + else if (family == 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;