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

Unified error messages about duplicate directives.

Browse Source
This commit is contained in:
Ruslan Ermilov 2017-03-22 22:49:52 +03:00
parent a10267126c
commit abc9d62b03
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/http/ngx_http_core_module.c
View File

@ -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;

2
src/http/ngx_http_script.c
View File

@ -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));

2
src/stream/ngx_stream_script.c
View File

@ -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));