mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Proxy: simplified conditions of using unparsed uri.

Browse Source 
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.
This commit is contained in:
Roman Arutyunyan 2017-11-20 13:47:17 +03:00
parent 7b3f187bc6
commit de11c2ad09
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/http/modules/ngx_http_proxy_module.c
View File

@ -1086,8 +1086,7 @@ ngx_http_proxy_create_key(ngx_http_request_t *r)
return NGX_OK; 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; *key = r->unparsed_uri;
u->uri = r->unparsed_uri; u->uri = r->unparsed_uri;
@ -1201,8 +1200,7 @@ ngx_http_proxy_create_request(ngx_http_request_t *r)
if (plcf->proxy_lengths && ctx->vars.uri.len) { if (plcf->proxy_lengths && ctx->vars.uri.len) {
uri_len = 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; unparsed_uri = 1;
uri_len = r->unparsed_uri.len; uri_len = r->unparsed_uri.len;