diff options
| author | Roman Arutyunyan <arut@nginx.com> | 2017-11-20 20:50:35 +0300 |
|---|---|---|
| committer | Roman Arutyunyan <arut@nginx.com> | 2017-11-20 20:50:35 +0300 |
| commit | 6754a404669b527340dd74270289da6adfc6302f (patch) | |
| tree | f9d63f90d689ea560f0c9660dcfad84f92fcd34e /src/http/modules/ngx_http_proxy_module.c | |
| parent | 891908cd0cdf72fca7d4b3de4a8a6fa3602e5cf7 (diff) | |
| download | nginx-6754a404669b527340dd74270289da6adfc6302f.tar.gz nginx-6754a404669b527340dd74270289da6adfc6302f.zip | |
Proxy: escape explicit space in URI in default cache key.
If the flag space_in_uri is set, the URI in HTTP upstream request is escaped to
convert space to %20. However this flag is not checked while creating the
default cache key. This leads to different cache keys for requests
'/foo bar' and '/foo%20bar', while the upstream requests are identical.
Additionally, the change fixes background cache updates when the client URI
contains unescaped space. Default cache key in a subrequest is always based on
escaped URI, while the main request may not escape it. As a result, background
cache update subrequest may update a different cache entry.
Diffstat (limited to 'src/http/modules/ngx_http_proxy_module.c')
| -rw-r--r-- | src/http/modules/ngx_http_proxy_module.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index 6bbbfaebf..efb4bed8e 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -1095,7 +1095,7 @@ ngx_http_proxy_create_key(ngx_http_request_t *r) loc_len = (r->valid_location && ctx->vars.uri.len) ? plcf->location.len : 0; - if (r->quoted_uri || r->internal) { + if (r->quoted_uri || r->space_in_uri || r->internal) { escape = 2 * ngx_escape_uri(NULL, r->uri.data + loc_len, r->uri.len - loc_len, NGX_ESCAPE_URI); } else { |