Mercurial > hg > nginx-quic
comparison 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 |
comparison
equal
deleted
inserted
replaced
3220:cdcd9e29c589 | 3221:c8de5a8b6d17 |
---|---|
379 } | 379 } |
380 | 380 |
381 r->virtual_names = addr_conf->virtual_names; | 381 r->virtual_names = addr_conf->virtual_names; |
382 | 382 |
383 /* the default server configuration for the address:port */ | 383 /* the default server configuration for the address:port */ |
384 cscf = addr_conf->core_srv_conf; | 384 cscf = addr_conf->default_server; |
385 | 385 |
386 r->main_conf = cscf->ctx->main_conf; | 386 r->main_conf = cscf->ctx->main_conf; |
387 r->srv_conf = cscf->ctx->srv_conf; | 387 r->srv_conf = cscf->ctx->srv_conf; |
388 r->loc_conf = cscf->ctx->loc_conf; | 388 r->loc_conf = cscf->ctx->loc_conf; |
389 | 389 |
1702 | 1702 |
1703 sn = r->virtual_names->regex; | 1703 sn = r->virtual_names->regex; |
1704 | 1704 |
1705 for (i = 0; i < r->virtual_names->nregex; i++) { | 1705 for (i = 0; i < r->virtual_names->nregex; i++) { |
1706 | 1706 |
1707 if (sn[i].core_srv_conf->captures && r->captures == NULL) { | 1707 if (sn[i].server->captures && r->captures == NULL) { |
1708 | 1708 |
1709 ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3; | 1709 ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3; |
1710 | 1710 |
1711 r->captures = ngx_palloc(r->pool, ncaptures * sizeof(int)); | 1711 r->captures = ngx_palloc(r->pool, ncaptures * sizeof(int)); |
1712 if (r->captures == NULL) { | 1712 if (r->captures == NULL) { |
1728 return NGX_ERROR; | 1728 return NGX_ERROR; |
1729 } | 1729 } |
1730 | 1730 |
1731 /* match */ | 1731 /* match */ |
1732 | 1732 |
1733 cscf = sn[i].core_srv_conf; | 1733 cscf = sn[i].server; |
1734 | 1734 |
1735 r->ncaptures = ncaptures; | 1735 r->ncaptures = ncaptures; |
1736 r->captures_data = host; | 1736 r->captures_data = host; |
1737 | 1737 |
1738 goto found; | 1738 goto found; |