comparison src/http/modules/ngx_http_rewrite_module.c @ 104:146eff53ab60 NGINX_0_2_6

nginx 0.2.6 *) 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.
author Igor Sysoev <http://sysoev.ru>
date Wed, 05 Oct 2005 00:00:00 +0400
parents 71c46860eb55
children d25a1d6034f1
comparison
equal deleted inserted replaced
103:acdd83ee07cb 104:146eff53ab60
689 clcf->name = pclcf->name; 689 clcf->name = pclcf->name;
690 clcf->noname = 1; 690 clcf->noname = 1;
691 691
692 if (pclcf->locations.elts == NULL) { 692 if (pclcf->locations.elts == NULL) {
693 if (ngx_array_init(&pclcf->locations, cf->pool, 4, sizeof(void *)) 693 if (ngx_array_init(&pclcf->locations, cf->pool, 4, sizeof(void *))
694 == NGX_ERROR) 694 == NGX_ERROR)
695 { 695 {
696 return NGX_CONF_ERROR; 696 return NGX_CONF_ERROR;
697 } 697 }
698 } 698 }
699 699
756 ((u_char *) if_code + ((u_char *) lcf->codes->elts - elts)); 756 ((u_char *) if_code + ((u_char *) lcf->codes->elts - elts));
757 } 757 }
758 758
759 if_code->next = (u_char *) lcf->codes->elts + lcf->codes->nelts 759 if_code->next = (u_char *) lcf->codes->elts + lcf->codes->nelts
760 - (u_char *) if_code; 760 - (u_char *) if_code;
761
762 /* the code array belong to parent block */
763
764 nlcf->codes = NULL;
761 765
762 return NGX_CONF_OK; 766 return NGX_CONF_OK;
763 } 767 }
764 768
765 769
1046 index = ngx_http_get_variable_index(cf, &value[1]); 1050 index = ngx_http_get_variable_index(cf, &value[1]);
1047 if (index == NGX_ERROR) { 1051 if (index == NGX_ERROR) {
1048 return NGX_CONF_ERROR; 1052 return NGX_CONF_ERROR;
1049 } 1053 }
1050 1054
1051 v->handler = ngx_http_rewrite_var; 1055 if (v->handler == NULL) {
1052 v->data = index; 1056 v->handler = ngx_http_rewrite_var;
1057 v->data = index;
1058 }
1053 1059
1054 n = ngx_http_script_variables_count(&value[2]); 1060 n = ngx_http_script_variables_count(&value[2]);
1055 1061
1056 if (n == 0) { 1062 if (n == 0) {
1057 val = ngx_http_script_start_code(cf->pool, &lcf->codes, 1063 val = ngx_http_script_start_code(cf->pool, &lcf->codes,