Mercurial > hg > nginx
diff src/http/ngx_http_request.c @ 2549:2d34fba7cf06
captures support in server_name
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Fri, 06 Mar 2009 12:50:20 +0000 |
parents | a6d6d762c554 |
children | 0cf6662e4448 |
line wrap: on
line diff
--- a/src/http/ngx_http_request.c Fri Mar 06 12:49:22 2009 +0000 +++ b/src/http/ngx_http_request.c Fri Mar 06 12:50:20 2009 +0000 @@ -1653,11 +1653,33 @@ name.len = len; name.data = server; + len = 0; + sn = vn->regex; for (i = 0; i < vn->nregex; i++) { - n = ngx_regex_exec(sn[i].regex, &name, NULL, 0); + if (sn[i].captures && r->captures == NULL) { + + len = (NGX_HTTP_MAX_CAPTURES + 1) * 3 * sizeof(int); + + r->captures = ngx_palloc(r->pool, len); + if (r->captures == NULL) { + return NGX_ERROR; + } + + if (server == buf) { + server = ngx_pnalloc(r->pool, len); + if (server == NULL) { + return NGX_ERROR; + } + + ngx_memcpy(server, buf, len); + name.data = server; + } + } + + n = ngx_regex_exec(sn[i].regex, &name, r->captures, len); if (n == NGX_REGEX_NO_MATCHED) { continue; @@ -1675,6 +1697,9 @@ cscf = sn[i].core_srv_conf; + r->ncaptures = len; + r->captures_data = server; + goto found; } }