mirror of
https://github.com/nginx/nginx.git
synced 2025-06-09 10:52:47 +08:00
Unified error messages about duplicate directives.
This commit is contained in:
parent
a10267126c
commit
abc9d62b03
@ -4529,7 +4529,7 @@ ngx_http_core_limit_except(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
ngx_http_core_loc_conf_t *clcf;
|
ngx_http_core_loc_conf_t *clcf;
|
||||||
|
|
||||||
if (pclcf->limit_except) {
|
if (pclcf->limit_except) {
|
||||||
return "duplicate";
|
return "is duplicate";
|
||||||
}
|
}
|
||||||
|
|
||||||
pclcf->limit_except = 0xffffffff;
|
pclcf->limit_except = 0xffffffff;
|
||||||
|
@ -220,7 +220,7 @@ ngx_http_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
cv = (ngx_http_complex_value_t **) (p + cmd->offset);
|
cv = (ngx_http_complex_value_t **) (p + cmd->offset);
|
||||||
|
|
||||||
if (*cv != NULL) {
|
if (*cv != NULL) {
|
||||||
return "duplicate";
|
return "is duplicate";
|
||||||
}
|
}
|
||||||
|
|
||||||
*cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
|
*cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
|
||||||
|
@ -222,7 +222,7 @@ ngx_stream_set_complex_value_slot(ngx_conf_t *cf, ngx_command_t *cmd,
|
|||||||
cv = (ngx_stream_complex_value_t **) (p + cmd->offset);
|
cv = (ngx_stream_complex_value_t **) (p + cmd->offset);
|
||||||
|
|
||||||
if (*cv != NULL) {
|
if (*cv != NULL) {
|
||||||
return "duplicate";
|
return "is duplicate";
|
||||||
}
|
}
|
||||||
|
|
||||||
*cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));
|
*cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));
|
||||||
|
Loading…
Reference in New Issue
Block a user