Mercurial > hg > nginx

comparison src/http/ngx_http_core_module.c @ 3221:c8de5a8b6d17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 cdcd9e29c589
children 8e76e636ae3b
comparison
equal deleted inserted replaced
3220:cdcd9e29c589 3221:c8de5a8b6d17
2875 } 2875 }
2876 2876
2877 #if (NGX_PCRE) 2877 #if (NGX_PCRE)
2878 sn->regex = NULL; 2878 sn->regex = NULL;
2879 #endif 2879 #endif
2880 sn->core_srv_conf = conf; 2880 sn->server = conf;
2881 sn->name.len = conf->server_name.len; 2881 sn->name.len = conf->server_name.len;
2882 sn->name.data = conf->server_name.data; 2882 sn->name.data = conf->server_name.data;
2883 } 2883 }
2884 2884
2885 ngx_conf_merge_size_value(conf->connection_pool_size, 2885 ngx_conf_merge_size_value(conf->connection_pool_size,
3527 } 3527 }
3528 3528
3529 #if (NGX_PCRE) 3529 #if (NGX_PCRE)
3530 sn->regex = NULL; 3530 sn->regex = NULL;
3531 #endif 3531 #endif
3532 sn->core_srv_conf = cscf; 3532 sn->server = cscf;
3533 sn->name = value[i]; 3533 sn->name = value[i];
3534 3534
3535 ngx_strlow(sn->name.data, sn->name.data, sn->name.len); 3535 ngx_strlow(sn->name.data, sn->name.data, sn->name.len);
3536 3536
3537 if (value[i].data[0] != '~') { 3537 if (value[i].data[0] != '~') {