Hakase/nginx-build
2
1 Fork 1
Code Issues Pull Requests Releases Activity

Latest update - 7624

Browse Source
This commit is contained in:
Hakase
2020-02-13 08:43:38 +09:00
parent c975811c7b
commit 795a5f5d70
1 changed files with 29 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/http/ngx_http_core_module.c
+29 -31
View File
@@ -2681,43 +2681,41 @@ ngx_http_get_forwarded_addr_internal(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;
ngx_int_t rc;
ngx_addr_t paddr; ngx_addr_t paddr;
ngx_uint_t found;
if (ngx_cidr_match(addr->sockaddr, proxies) != NGX_OK) { found = 0;
return NGX_DECLINED;
}
for (p = xff + xfflen - 1; p > xff; p--, xfflen--) { do {
if (*p != ' ' && *p != ',') {
break;
}
}
for ( /* void */ ; p > xff; p--) { if (ngx_cidr_match(addr->sockaddr, proxies) != NGX_OK) {
if (*p == ' ' || *p == ',') { return found ? NGX_DONE : NGX_DECLINED;
p++;
break;
}
}
if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff)) != NGX_OK) {
return NGX_DECLINED;
}
*addr = paddr;
if (recursive && p > xff) {
rc = ngx_http_get_forwarded_addr_internal(r, addr, xff, p - 1 - xff,
proxies, 1);
if (rc == NGX_DECLINED) {
return NGX_DONE;
} }
/* rc == NGX_OK || rc == NGX_DONE */ for (p = xff + xfflen - 1; p > xff; p--, xfflen--) {
return rc; if (*p != ' ' && *p != ',') {
} break;
}
}
for ( /* void */ ; p > xff; p--) {
if (*p == ' ' || *p == ',') {
p++;
break;
}
}
if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff))
!= NGX_OK)
{
return found ? NGX_DONE : NGX_DECLINED;
}
*addr = paddr;
found = 1;
xfflen = p - 1 - xff;
} while (recursive && p > xff);
return NGX_OK; return NGX_OK;
} }