aboutsummaryrefslogtreecommitdiff
path: root/src/http/ngx_http_core_module.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2009-10-21 16:52:10 +0000
committerIgor Sysoev <igor@sysoev.ru>2009-10-21 16:52:10 +0000
commitcd8b43cde730a2fe038c8eb8ced09eb075a73969 (patch)
treef9b79aad0d8277e985ec1f1defe82d1d628a9432 /src/http/ngx_http_core_module.c
parentf2694cb9250a7fd13f8f681756f103529a1f5772 (diff)
downloadnginx-cd8b43cde730a2fe038c8eb8ced09eb075a73969.tar.gz
nginx-cd8b43cde730a2fe038c8eb8ced09eb075a73969.zip
rename core_srv_conf fields to more understandable default_server and server
Diffstat (limited to 'src/http/ngx_http_core_module.c')
-rw-r--r--src/http/ngx_http_core_module.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 88d58e6fe..88d32e1b3 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -2877,7 +2877,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
#if (NGX_PCRE)
sn->regex = NULL;
#endif
- sn->core_srv_conf = conf;
+ sn->server = conf;
sn->name.len = conf->server_name.len;
sn->name.data = conf->server_name.data;
}
@@ -3529,7 +3529,7 @@ ngx_http_core_server_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
#if (NGX_PCRE)
sn->regex = NULL;
#endif
- sn->core_srv_conf = cscf;
+ sn->server = cscf;
sn->name = value[i];
ngx_strlow(sn->name.data, sn->name.data, sn->name.len);