Mercurial > hg > nginx
changeset 3719:de63e1336cdb
allow server_name "" as the first name
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 29 Jul 2010 09:55:54 +0000 |
parents | bfd84b583868 |
children | c3a37fc8d1fe |
files | src/http/ngx_http_core_module.c |
diffstat | 1 files changed, 10 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Thu Jul 29 09:30:15 2010 +0000 +++ b/src/http/ngx_http_core_module.c Thu Jul 29 09:55:54 2010 +0000 @@ -3609,23 +3609,16 @@ ch = value[1].data[0]; if (cscf->server_name.data == NULL) { - if (value[1].len) { - name = value[1]; - - if (ch == '.') { - name.len--; - name.data++; - } - - cscf->server_name.len = name.len; - cscf->server_name.data = ngx_pstrdup(cf->pool, &name); - if (cscf->server_name.data == NULL) { - return NGX_CONF_ERROR; - } - - } else { - ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, - "the first server name must not be empty"); + name = value[1]; + + if (ch == '.') { + name.len--; + name.data++; + } + + cscf->server_name.len = name.len; + cscf->server_name.data = ngx_pstrdup(cf->pool, &name); + if (cscf->server_name.data == NULL) { return NGX_CONF_ERROR; } }