Mercurial > hg > nginx
changeset 7167:8530aea9aa50
Proxy: simplified conditions of using unparsed uri.
Previously, the unparsed uri was explicitly allowed to be used only by the main
request. However the valid_unparsed_uri flag is nonzero only in the main
request, which makes the main request check pointless.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Mon, 20 Nov 2017 13:47:17 +0300 |
parents | a762ddf22dbb |
children | 46ebff8c6396 |
files | src/http/modules/ngx_http_proxy_module.c |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Fri Dec 01 15:59:14 2017 -0800 +++ b/src/http/modules/ngx_http_proxy_module.c Mon Nov 20 13:47:17 2017 +0300 @@ -1086,8 +1086,7 @@ return NGX_OK; - } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main) - { + } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) { *key = r->unparsed_uri; u->uri = r->unparsed_uri; @@ -1201,8 +1200,7 @@ if (plcf->proxy_lengths && ctx->vars.uri.len) { uri_len = ctx->vars.uri.len; - } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main) - { + } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) { unparsed_uri = 1; uri_len = r->unparsed_uri.len;