]> git.kaiwu.me - nginx.git/commitdiff
allow server_name "" as the first name
authorIgor Sysoev <igor@sysoev.ru>
Thu, 29 Jul 2010 09:55:54 +0000 (09:55 +0000)
committerIgor Sysoev <igor@sysoev.ru>
Thu, 29 Jul 2010 09:55:54 +0000 (09:55 +0000)
src/http/ngx_http_core_module.c

index f7bb55d5e373d20f26a629ac015ba25b3a66dc0f..8f1ab08418c4e1439393b961d54071a66e42c888 100644 (file)
@@ -3609,23 +3609,16 @@ ngx_http_core_server_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     ch = value[1].data[0];
 
     if (cscf->server_name.data == NULL) {
-        if (value[1].len) {
-            name = value[1];
+        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;
-            }
+        if (ch == '.') {
+            name.len--;
+            name.data++;
+        }
 
-        } else {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "the first server name must not be empty");
+        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;
         }
     }