From f975df2451ff989ec252731b25a45ac02985372a Mon Sep 17 00:00:00 2001 From: Igor Sysoev Date: Wed, 5 Oct 2005 12:54:56 +0000 Subject: Changes with nginx 0.2.6 05 Oct 2005 *) Change: while using load-balancing the time before the failed backend retry was decreased from 60 to 10 seconds. *) Change: the "proxy_pass_unparsed_uri" was canceled, the original URI now passed, if the URI part is omitted in "proxy_pass" directive. *) Feature: the "error_page" directive supports redirects and allows more flexible to change an error code. *) Change: the charset in the "Content-Type" header line now is ignored in proxied subrequests. *) Bugfix: if the URI was changed in the "if" block and request did not found new configuration, then the ngx_http_rewrite_module rules ran again. *) Bugfix: if the "set" directive set the ngx_http_geo_module variable in some configuration part, the this variable was not available in other configuration parts and the "using uninitialized variable" error was occurred; bug appeared in 0.2.2. --- src/http/modules/ngx_http_rewrite_module.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'src/http/modules/ngx_http_rewrite_module.c') diff --git a/src/http/modules/ngx_http_rewrite_module.c b/src/http/modules/ngx_http_rewrite_module.c index 693495e3b..c575d4343 100644 --- a/src/http/modules/ngx_http_rewrite_module.c +++ b/src/http/modules/ngx_http_rewrite_module.c @@ -691,7 +691,7 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (pclcf->locations.elts == NULL) { if (ngx_array_init(&pclcf->locations, cf->pool, 4, sizeof(void *)) - == NGX_ERROR) + == NGX_ERROR) { return NGX_CONF_ERROR; } @@ -759,6 +759,10 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if_code->next = (u_char *) lcf->codes->elts + lcf->codes->nelts - (u_char *) if_code; + /* the code array belong to parent block */ + + nlcf->codes = NULL; + return NGX_CONF_OK; } @@ -1048,8 +1052,10 @@ ngx_http_rewrite_set(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) return NGX_CONF_ERROR; } - v->handler = ngx_http_rewrite_var; - v->data = index; + if (v->handler == NULL) { + v->handler = ngx_http_rewrite_var; + v->data = index; + } n = ngx_http_script_variables_count(&value[2]); -- cgit v1.2.1