nginx: src/http/ngx_http_core_module.c comparison

Made ngx_http_get_forwarded_addr_internal() non-recursive.

author	Vladimir Homutov <vl@nginx.com>
date	Tue, 11 Feb 2020 13:22:44 +0300
parents	02a539522be4
children	f001d9384293

comparison

equal deleted inserted replaced

-:72b792bb3885
+:1055e43e4fab
 static ngx_int_t
 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      *p;
-ngx_int_t    rc;
 ngx_addr_t   paddr;
+ngx_uint_t   found;
-if (ngx_cidr_match(addr->sockaddr, proxies) != NGX_OK) {
-return NGX_DECLINED;
+found = 0;
-}
+do {
-for (p = xff + xfflen - 1; p > xff; p--, xfflen--) {
-if (*p != ' ' && *p != ',') {
+if (ngx_cidr_match(addr->sockaddr, proxies) != NGX_OK) {
-break;
+return found ? NGX_DONE : NGX_DECLINED;
 }
-}
+for (p = xff + xfflen - 1; p > xff; p--, xfflen--) {
-for ( /* void */ ; p > xff; p--) {
+if (*p != ' ' && *p != ',') {
-if (*p == ' ' || *p == ',') {
+break;
-p++;
+}
-break;
+}
-}
-}
+for ( /* void */ ; p > xff; p--) {
+if (*p == ' ' || *p == ',') {
-if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff)) != NGX_OK) {
+p++;
-return NGX_DECLINED;
+break;
 }
+}
-*addr = paddr;
+if (ngx_parse_addr_port(r->pool, &paddr, p, xfflen - (p - xff))
-if (recursive && p > xff) {
+!= NGX_OK)
-rc = ngx_http_get_forwarded_addr_internal(r, addr, xff, p - 1 - xff,
+{
-proxies, 1);
+return found ? NGX_DONE : NGX_DECLINED;
+}
-if (rc == NGX_DECLINED) {
-return NGX_DONE;
+*addr = paddr;
-}
+found = 1;
+xfflen = p - 1 - xff;
-/* rc == NGX_OK || rc == NGX_DONE  */
-return rc;
+} while (recursive && p > xff);
-}
 return NGX_OK;
 }

Mercurial > hg > nginx