Mercurial > hg > nginx
changeset 3580:667c22171519 stable-0.7
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
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 07 Jun 2010 09:36:33 +0000 |
parents | d612c9374453 |
children | 17995396463d |
files | src/http/modules/ngx_http_proxy_module.c src/http/ngx_http_header_filter_module.c src/http/ngx_http_variables.c |
diffstat | 3 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Mon Jun 07 09:25:39 2010 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Mon Jun 07 09:36:33 2010 +0000 @@ -1906,7 +1906,7 @@ * conf->body_set_len = NULL; * conf->body_set = NULL; * conf->body_source = { 0, NULL }; - * conf->rewrite_locations = NULL; + * conf->redirects = NULL; */ conf->upstream.store = NGX_CONF_UNSET; @@ -2747,9 +2747,16 @@ } if (ngx_strcmp(value[1].data, "default") == 0) { + if (plcf->proxy_lengths) { + ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, + "\"proxy_redirect default\" may not be used " + "with \"proxy_pass\" directive with variables"); + return NGX_CONF_ERROR; + } + if (plcf->url.data == NULL) { ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "\"proxy_rewrite_location default\" must go " + "\"proxy_redirect default\" must go " "after the \"proxy_pass\" directive"); return NGX_CONF_ERROR; }
--- a/src/http/ngx_http_header_filter_module.c Mon Jun 07 09:25:39 2010 +0000 +++ b/src/http/ngx_http_header_filter_module.c Mon Jun 07 09:36:33 2010 +0000 @@ -538,8 +538,8 @@ r->headers_out.location->value.len = b->last - p; r->headers_out.location->value.data = p; - r->headers_out.location->key.len = sizeof("Location: ") - 1; - r->headers_out.location->key.data = (u_char *) "Location: "; + r->headers_out.location->key.len = sizeof("Location") - 1; + r->headers_out.location->key.data = (u_char *) "Location"; *b->last++ = CR; *b->last++ = LF; }
--- a/src/http/ngx_http_variables.c Mon Jun 07 09:25:39 2010 +0000 +++ b/src/http/ngx_http_variables.c Mon Jun 07 09:36:33 2010 +0000 @@ -494,7 +494,7 @@ 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)