aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_request.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-10-21 16:27:48 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-10-21 16:27:48 +0000
commit2a634f53421af2fb09dcd9f3b0641723eb0370a6 (patch)
tree89f849e7e144623d9598564223bf4c7db704c2de /src/http/ngx_http_request.c
parentd2d0931ed5a40d63bc6d9593c06604cb5e0eeca6 (diff)
downloadnginx-2a634f53421af2fb09dcd9f3b0641723eb0370a6.tar.gz
nginx-2a634f53421af2fb09dcd9f3b0641723eb0370a6.zip
fix r3218:
Initially building lists of ports, addresses, and server names had been placed at final configuration stage, because complete set of the "listen"s and the "server_names" were required for this operation. r3218 broke it, because the "listen"s go usually first in configuration, and cscf->server_names is empty at this stage, therefore no virtual names were configured. Now server configurations are stored in array for each address:port to configure virtual names. Also regex captures flag is moved from server names to core server configuration.
Diffstat (limited to 'src/http/ngx_http_request.c')
-rw-r--r--src/http/ngx_http_request.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
index ceb42b3c8..a4041f515 100644
--- a/src/http/ngx_http_request.c
+++ b/src/http/ngx_http_request.c
@@ -1704,7 +1704,7 @@ ngx_http_find_virtual_server(ngx_http_request_t *r, u_char *host, size_t len)
for (i = 0; i < r->virtual_names->nregex; i++) {
- if (sn[i].captures && r->captures == NULL) {
+ if (sn[i].core_srv_conf->captures && r->captures == NULL) {
ncaptures = (NGX_HTTP_MAX_CAPTURES + 1) * 3;