Mercurial > hg > nginx-vendor-0-5
diff src/http/modules/ngx_http_rewrite_module.c @ 66:818201e5a553 NGINX_0_1_33
nginx 0.1.33
*) Bugfix: nginx could not be built with the --without-pcre parameter;
bug appeared in 0.1.29.
*) Bugfix: 3, 4, 7, and 8 the "proxy_set_header" directives in one
level cause the bus fault on start up.
*) Bugfix: the HTTP protocol was specified in the HTTPS redirects.
*) Bugfix: if the "rewrite" directive used the captures inside the "if"
directive, then the 500 error code was returned.
author | Igor Sysoev <http://sysoev.ru> |
---|---|
date | Mon, 23 May 2005 00:00:00 +0400 |
parents | 5db440287648 |
children | 056fd0e5a5a6 |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_rewrite_module.c +++ b/src/http/modules/ngx_http_rewrite_module.c @@ -556,8 +556,7 @@ ngx_http_rewrite(ngx_conf_t *cf, ngx_com regex_end->redirect = regex->redirect; if (last) { - code = ngx_http_script_add_code(lcf->codes, sizeof(uintptr_t), - ®ex); + code = ngx_http_script_add_code(lcf->codes, sizeof(uintptr_t), ®ex); if (code == NULL) { return NGX_CONF_ERROR; } @@ -713,6 +712,11 @@ ngx_http_rewrite_if(ngx_conf_t *cf, ngx_ } + if (lcf->captures < nlcf->captures) { + lcf->captures = nlcf->captures; + } + + if (elts != lcf->codes->elts) { if_code = (ngx_http_script_if_code_t *) ((u_char *) if_code + ((u_char *) lcf->codes->elts - elts));