Mercurial > hg > nginx

changeset 3720:c3a37fc8d1fe

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
files src/http/ngx_http_core_module.c
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3011,7 +3011,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t 
     }
 
     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);
         if (sn == NULL) {
@@ -3022,8 +3022,7 @@ ngx_http_core_merge_srv_conf(ngx_conf_t 
         sn->regex = NULL;
 #endif
         sn->server = conf;
-        sn->name.len = conf->server_name.len;
-        sn->name.data = conf->server_name.data;
+        ngx_str_set(&sn->name, "");
     }
 
     return NGX_CONF_OK;