Mercurial > hg > nginx
diff src/http/modules/ngx_http_rewrite_module.c @ 517:dadfa78d2270 release-0.1.33
nginx-0.1.33-RELEASE import
*) Bugfix: nginx could not be built with the --without-pcre parameter;
the bug had 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 <igor@sysoev.ru> |
---|---|
date | Mon, 23 May 2005 12:07:45 +0000 |
parents | 417a087c9c4d |
children | 12234c998d83 |
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));