Mercurial > hg > nginx

changeset 4625:3709ce127763

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed compilation warning introduced in r4624.
author Ruslan Ermilov <ru@nginx.com>
date Mon, 14 May 2012 13:15:22 +0000
parents df93068953c0
children d0db70f4c13b
files src/http/ngx_http_core_module.c
diffstat 1 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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_req
 
     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;