From 149578df888a43b592c5efc4fb2e0441dbd5a9ff Mon Sep 17 00:00:00 2001
From: Igor Sysoev <igor@sysoev.ru>
Date: Mon, 7 Jun 2010 09:36:33 +0000
Subject: 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
---
 src/http/ngx_http_variables.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/http/ngx_http_variables.c')

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)
-- 
cgit