mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-12 21:52:41 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

use an empty name as default server_name instread of hostname

Browse Source
This commit is contained in:
Igor Sysoev 2010-07-29 10:00:04 +00:00
parent e8cf60da34
commit a69cf2d005
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/http/ngx_http_core_module.c
View File

@ -3011,7 +3011,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
} }
if (conf->server_name.data == NULL) { if (conf->server_name.data == NULL) {
conf->server_name = cf->cycle->hostname; ngx_str_set(&conf->server_name, "");
sn = ngx_array_push(&conf->server_names); sn = ngx_array_push(&conf->server_names);
if (sn == NULL) { if (sn == NULL) {
@ -3022,8 +3022,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
sn->regex = NULL; sn->regex = NULL;
#endif #endif
sn->server = conf; sn->server = conf;
sn->name.len = conf->server_name.len; ngx_str_set(&sn->name, "");
sn->name.data = conf->server_name.data;
} }
return NGX_CONF_OK; return NGX_CONF_OK;