mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-09 19:12:47 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed win32 build after changes in r4624.

Browse Source
This commit is contained in:
Ruslan Ermilov 2012-05-15 08:10:59 +00:00
parent 0215fcc9b8
commit e3bb319e34
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/http/ngx_http_core_module.c
View File

@ -2704,7 +2704,7 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
u_char *xff, size_t xfflen, ngx_array_t *proxies, int recursive) u_char *xff, size_t xfflen, ngx_array_t *proxies, int recursive)
{ {
u_char *p; u_char *p;
in_addr_t *inaddr; in_addr_t inaddr;
ngx_addr_t paddr; ngx_addr_t paddr;
ngx_cidr_t *cidr; ngx_cidr_t *cidr;
ngx_uint_t family, i; ngx_uint_t family, i;
@ -2714,7 +2714,7 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
#endif #endif
#if (NGX_SUPPRESS_WARN) #if (NGX_SUPPRESS_WARN)
inaddr = NULL; inaddr = 0;
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
inaddr6 = NULL; inaddr6 = NULL;
#endif #endif
@ -2723,7 +2723,7 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
family = addr->sockaddr->sa_family; family = addr->sockaddr->sa_family;
if (family == AF_INET) { if (family == AF_INET) {
inaddr = &((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr; inaddr = ((struct sockaddr_in *) addr->sockaddr)->sin_addr.s_addr;
} }
#if (NGX_HAVE_INET6) #if (NGX_HAVE_INET6)
@ -2732,7 +2732,7 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
if (IN6_IS_ADDR_V4MAPPED(inaddr6)) { if (IN6_IS_ADDR_V4MAPPED(inaddr6)) {
family = AF_INET; family = AF_INET;
inaddr = (in_addr_t *) &inaddr6->s6_addr[12]; inaddr = *(in_addr_t *) &inaddr6->s6_addr[12];
} }
} }
#endif #endif
@ -2762,7 +2762,7 @@ ngx_http_get_forwarded_addr(ngx_http_request_t *r, ngx_addr_t *addr,
#endif #endif
default: /* AF_INET */ default: /* AF_INET */
if ((*inaddr & cidr[i].u.in.mask) != cidr[i].u.in.addr) { if ((inaddr & cidr[i].u.in.mask) != cidr[i].u.in.addr) {
goto next; goto next;
} }
break; break;