mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Simplified code about duplicate root/alias directive.

Browse Source
This commit is contained in:
Ruslan Ermilov 2017-03-22 23:36:35 +03:00
parent abc9d62b03
commit e81ad21fea
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/http/ngx_http_core_module.c
View File

@ -4405,16 +4405,14 @@ ngx_http_core_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
if (clcf->root.data) { if (clcf->root.data) {
if ((clcf->alias != 0) == alias) { if ((clcf->alias != 0) == alias) {
ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, return "is duplicate";
"\"%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");
} }
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; return NGX_CONF_ERROR;
} }