Mercurial > hg > nginx

comparison src/http/modules/ngx_http_proxy_module.c @ 7167:8530aea9aa50

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 2a288909abc6
children e8e19f5e0b8b
comparison
equal deleted inserted replaced
7166:a762ddf22dbb 7167:8530aea9aa50
1084 *key = ctx->vars.uri; 1084 *key = ctx->vars.uri;
1085 u->uri = ctx->vars.uri; 1085 u->uri = ctx->vars.uri;
1086 1086
1087 return NGX_OK; 1087 return NGX_OK;
1088 1088
1089 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main) 1089 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) {
1090 {
1091 *key = r->unparsed_uri; 1090 *key = r->unparsed_uri;
1092 u->uri = r->unparsed_uri; 1091 u->uri = r->unparsed_uri;
1093 1092
1094 return NGX_OK; 1093 return NGX_OK;
1095 } 1094 }
1199 unparsed_uri = 0; 1198 unparsed_uri = 0;
1200 1199
1201 if (plcf->proxy_lengths && ctx->vars.uri.len) { 1200 if (plcf->proxy_lengths && ctx->vars.uri.len) {
1202 uri_len = ctx->vars.uri.len; 1201 uri_len = ctx->vars.uri.len;
1203 1202
1204 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri && r == r->main) 1203 } else if (ctx->vars.uri.len == 0 && r->valid_unparsed_uri) {
1205 {
1206 unparsed_uri = 1; 1204 unparsed_uri = 1;
1207 uri_len = r->unparsed_uri.len; 1205 uri_len = r->unparsed_uri.len;
1208 1206
1209 } else { 1207 } else {
1210 loc_len = (r->valid_location && ctx->vars.uri.len) ? 1208 loc_len = (r->valid_location && ctx->vars.uri.len) ?