Mercurial > hg > nginx

comparison src/http/modules/ngx_http_rewrite_module.c @ 517:dadfa78d2270 release-0.1.33

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
516:ea9642a65514 517:dadfa78d2270
554 regex_end->args = regex->args; 554 regex_end->args = regex->args;
555 regex_end->add_args = regex->add_args; 555 regex_end->add_args = regex->add_args;
556 regex_end->redirect = regex->redirect; 556 regex_end->redirect = regex->redirect;
557 557
558 if (last) { 558 if (last) {
559 code = ngx_http_script_add_code(lcf->codes, sizeof(uintptr_t), 559 code = ngx_http_script_add_code(lcf->codes, sizeof(uintptr_t), &regex);
560 &regex);
561 if (code == NULL) { 560 if (code == NULL) {
562 return NGX_CONF_ERROR; 561 return NGX_CONF_ERROR;
563 } 562 }
564 563
565 *code = (uintptr_t) NULL; 564 *code = (uintptr_t) NULL;
711 if (rv != NGX_CONF_OK) { 710 if (rv != NGX_CONF_OK) {
712 return rv; 711 return rv;
713 } 712 }
714 713
715 714
715 if (lcf->captures < nlcf->captures) {
716 lcf->captures = nlcf->captures;
717 }
718
719
716 if (elts != lcf->codes->elts) { 720 if (elts != lcf->codes->elts) {
717 if_code = (ngx_http_script_if_code_t *) 721 if_code = (ngx_http_script_if_code_t *)
718 ((u_char *) if_code + ((u_char *) lcf->codes->elts - elts)); 722 ((u_char *) if_code + ((u_char *) lcf->codes->elts - elts));
719 } 723 }
720 724