diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:36:33 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-06-07 09:36:33 +0000 |
| commit | 149578df888a43b592c5efc4fb2e0441dbd5a9ff (patch) | |
| tree | c1a80c088abad460411574fbfecc1663cfd738ad /src/http/ngx_http_variables.c | |
| parent | 3b755fc6c441867122a6fe575152a52be48d1eb0 (diff) | |
| download | nginx-149578df888a43b592c5efc4fb2e0441dbd5a9ff.tar.gz nginx-149578df888a43b592c5efc4fb2e0441dbd5a9ff.tar.bz2 | |
merge r3452, r3462, r3471, r3472:
fix miscellaneous name bugs:
*) fix $upstream_http_ variable prefix length
*) use a right "Location" header name, however, it did not harm,
since ngx_http_variable_sent_location() never use key name field
*) fix proxy_redirect name in error message
*) "proxy_redirect default" may not be used if a proxy_pass uses variables
Diffstat (limited to 'src/http/ngx_http_variables.c')
| -rw-r--r-- | src/http/ngx_http_variables.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_variables.c b/src/http/ngx_http_variables.c index fc8ca9b02..f68edc27b 100644 --- a/src/http/ngx_http_variables.c +++ b/src/http/ngx_http_variables.c @@ -494,7 +494,7 @@ ngx_http_get_variable(ngx_http_request_t *r, ngx_str_t *name, ngx_uint_t key, return NULL; } - if (ngx_strncmp(name->data, "upstream_http_", 10) == 0) { + if (ngx_strncmp(name->data, "upstream_http_", 14) == 0) { if (ngx_http_upstream_header_variable(r, vv, (uintptr_t) name) == NGX_OK) |