From: Ruslan Ermilov <ru@nginx.com>
Date: Wed, 22 Mar 2017 20:36:35 +0000 (+0300)
Subject: Simplified code about duplicate root/alias directive.
X-Git-Tag: release-1.11.12~2
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=e81ad21fea390cf6f1f2e03223d8df569879dd78;p=nginx.git

Simplified code about duplicate root/alias directive.
---

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 1bd3ecd5c..c3957ba38 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4405,16 +4405,14 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     if (clcf->root.data) {
 
         if ((clcf->alias != 0) == alias) {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"%V\" directive is duplicate",
-                               &cmd->name);
-        } else {
-            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                               "\"%V\" directive is duplicate, "
-                               "\"%s\" directive was specified earlier",
-                               &cmd->name, clcf->alias ? "alias" : "root");
+            return "is duplicate";
         }
 
+        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                           "\"%V\" directive is duplicate, "
+                           "\"%s\" directive was specified earlier",
+                           &cmd->name, clcf->alias ? "alias" : "root");
+
         return NGX_CONF_ERROR;
     }