nginx: d6c507a46c90

changeset 4510:d6c507a46c90 stable-1.0

Merge of r4471: Variables: honor no_cacheable for not_found variables. Variables with the "not_found" flag set follow the same rules as ones with the "valid" flag set. Make sure ngx_http_get_flushed_variable() will flush non-cacheable variables with the "not_found" flag set. This fixes at least one known problem with $args not available in a subrequest (with args) when there were no args in the main request and $args variable was queried in the main request (reported by Laurence Rowe aka elro on irc). Also this eliminates unneeded call to ngx_http_get_indexed_variable() in cacheable case (as it will return cached value anyway).

author Maxim Dounin <mdounin@mdounin.ru>

date Mon, 05 Mar 2012 12:36:51 +0000

parents 8e24fb8ee3e7

children 83c26de984ef

files src/http/ngx_http_variables.c

diffstat

1 files changed, 1 insertions(+), 1 deletions(-) [+]

line wrap: on

line diff

--- a/src/http/ngx_http_variables.c
+++ b/src/http/ngx_http_variables.c
@@ -428,7 +428,7 @@ ngx_http_get_flushed_variable(ngx_http_r
 
     v = &r->variables[index];
 
-    if (v->valid) {
+    if (v->valid || v->not_found) {
         if (!v->no_cacheable) {
             return v;
         }