Mercurial > hg > nginx
comparison src/http/ngx_http_core_module.c @ 3720:c3a37fc8d1fe
use an empty name as default server_name instread of hostname
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 29 Jul 2010 10:00:04 +0000 |
parents | de63e1336cdb |
children | c62a2683bfbf |
comparison
equal
deleted
inserted
replaced
3719:de63e1336cdb | 3720:c3a37fc8d1fe |
---|---|
3009 return NGX_CONF_OK; | 3009 return NGX_CONF_OK; |
3010 } | 3010 } |
3011 } | 3011 } |
3012 | 3012 |
3013 if (conf->server_name.data == NULL) { | 3013 if (conf->server_name.data == NULL) { |
3014 conf->server_name = cf->cycle->hostname; | 3014 ngx_str_set(&conf->server_name, ""); |
3015 | 3015 |
3016 sn = ngx_array_push(&conf->server_names); | 3016 sn = ngx_array_push(&conf->server_names); |
3017 if (sn == NULL) { | 3017 if (sn == NULL) { |
3018 return NGX_CONF_ERROR; | 3018 return NGX_CONF_ERROR; |
3019 } | 3019 } |
3020 | 3020 |
3021 #if (NGX_PCRE) | 3021 #if (NGX_PCRE) |
3022 sn->regex = NULL; | 3022 sn->regex = NULL; |
3023 #endif | 3023 #endif |
3024 sn->server = conf; | 3024 sn->server = conf; |
3025 sn->name.len = conf->server_name.len; | 3025 ngx_str_set(&sn->name, ""); |
3026 sn->name.data = conf->server_name.data; | |
3027 } | 3026 } |
3028 | 3027 |
3029 return NGX_CONF_OK; | 3028 return NGX_CONF_OK; |
3030 } | 3029 } |
3031 | 3030 |