Changeset 6941:6e20a6479325 in nginx


Ignore:
Timestamp:
03/22/17 20:36:35 (35 hours ago)
Author:
Ruslan Ermilov <ru@…>
Branch:
default
Tags:
tip
Message:

Simplified code about duplicate root/alias directive.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/http/ngx_http_core_module.c

    r6940 r6941  
    44064406
    44074407        if ((clcf->alias != 0) == alias) {
    4408             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
    4409                                "\"%V\" directive is duplicate",
    4410                                &cmd->name);
    4411         } else {
    4412             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
    4413                                "\"%V\" directive is duplicate, "
    4414                                "\"%s\" directive was specified earlier",
    4415                                &cmd->name, clcf->alias ? "alias" : "root");
    4416         }
     4408            return "is duplicate";
     4409        }
     4410
     4411        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
     4412                           "\"%V\" directive is duplicate, "
     4413                           "\"%s\" directive was specified earlier",
     4414                           &cmd->name, clcf->alias ? "alias" : "root");
    44174415
    44184416        return NGX_CONF_ERROR;
Note: See TracChangeset for help on using the changeset viewer.