From: Ruslan Ermilov <ru@nginx.com>
Date: Wed, 12 Oct 2011 07:20:20 +0000 (+0000)
Subject: Removed old warning that suggested to use "server_name_in_redirect off"
X-Git-Tag: release-1.1.6~14
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=c8fdda4c2ff95422ffc1fbe39cb16f847992ecd0;p=nginx.git

Removed old warning that suggested to use "server_name_in_redirect off"
(now the default) in place of no longer supported "server_name *".
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 2bf6a19a7..f500c5dec 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -3839,13 +3839,6 @@ ngx_http_core_server_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
                                &value[i]);
         }
 
-        if (value[i].len == 1 && ch == '*') {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"server_name *\" is unsupported, use "
-                               "\"server_name_in_redirect off\" instead");
-            return NGX_CONF_ERROR;
-        }
-
         sn = ngx_array_push(&cscf->server_names);
         if (sn == NULL) {
             return NGX_CONF_ERROR;