diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-04-22 14:02:45 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-04-22 14:02:45 +0000 |
| commit | fa7d06ee4f31823f65c5aecea3a273940770bc9d (patch) | |
| tree | bceeb6ab03ce2171d33485f1dffaf6d37ea0d3e1 /src/http/ngx_http_variables.c | |
| parent | 185a5d172671b4b4346d801e144e055f3962d55d (diff) | |
| download | nginx-fa7d06ee4f31823f65c5aecea3a273940770bc9d.tar.gz nginx-fa7d06ee4f31823f65c5aecea3a273940770bc9d.zip | |
change processing variables accessed by SSI and perl module:
*) the indexed variables are always flushed
*) never show warning for not found variables
Diffstat (limited to 'src/http/ngx_http_variables.c')
| -rw-r--r-- | src/http/ngx_http_variables.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index eee997b19..c8d1c8dcb 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -441,8 +441,7 @@ ngx_http_get_flushed_variable(ngx_http_request_t *r, ngx_uint_t index) ngx_http_variable_value_t * -ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key, - ngx_uint_t nowarn) +ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key) { ngx_http_variable_t *v; ngx_http_variable_value_t *vv; @@ -454,7 +453,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key, if (v) { if (v->flags & NGX_HTTP_VAR_INDEXED) { - return ngx_http_get_indexed_variable(r, v->index); + return ngx_http_get_flushed_variable(r, v->index); } else { @@ -526,11 +525,6 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key, vv->not_found = 1; - if (nowarn == 0) { - ngx_log_error(NGX_LOG_ERR, r->connection->log, 0, - "unknown \"%V\" variable", name); - } - return vv; } |