Mercurial > hg > nginx-quic
diff src/http/ngx_http_request.c @ 3221:c8de5a8b6d17
rename core_srv_conf fields to more understandable default_server and server
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Wed, 21 Oct 2009 16:52:10 +0000 |
parents | 81b8416054b0 |
children | 1e1e66ef3a40 |
line wrap: on
line diff
--- a/src/http/ngx_http_request.c +++ b/src/http/ngx_http_request.c @@ -381,7 +381,7 @@ ngx_http_init_request(ngx_event_t *rev) r->virtual_names = addr_conf->virtual_names; /* the default server configuration for the address:port */ - cscf = addr_conf->core_srv_conf; + cscf = addr_conf->default_server; r->main_conf = cscf->ctx->main_conf; r->srv_conf = cscf->ctx->srv_conf; @@ -1704,7 +1704,7 @@ ngx_http_find_virtual_server(ngx_http_re for (i = 0; i < r->virtual_names->nregex; i++) { - if (sn[i].core_srv_conf->captures && r->captures == NULL) { + if (sn[i].server->captures && r->captures == NULL) { ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3; @@ -1730,7 +1730,7 @@ ngx_http_find_virtual_server(ngx_http_re /* match */ - cscf = sn[i].core_srv_conf; + cscf = sn[i].server; r->ncaptures = ncaptures; r->captures_data = host;