Mercurial > hg > nginx
changeset 6940:39ff6939266e
Unified error messages about duplicate directives.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 22 Mar 2017 22:49:52 +0300 |
parents | 633a36655bb6 |
children | 6e20a6479325 |
files | src/http/ngx_http_core_module.c src/http/ngx_http_script.c src/stream/ngx_stream_script.c |
diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/ngx_http_core_module.c Wed Mar 22 22:49:42 2017 +0300 +++ b/src/http/ngx_http_core_module.c Wed Mar 22 22:49:52 2017 +0300 @@ -4529,7 +4529,7 @@ ngx_http_core_loc_conf_t *clcf; if (pclcf->limit_except) { - return "duplicate"; + return "is duplicate"; } pclcf->limit_except = 0xffffffff;
--- a/src/http/ngx_http_script.c Wed Mar 22 22:49:42 2017 +0300 +++ b/src/http/ngx_http_script.c Wed Mar 22 22:49:52 2017 +0300 @@ -220,7 +220,7 @@ cv = (ngx_http_complex_value_t **) (p + cmd->offset); if (*cv != NULL) { - return "duplicate"; + return "is duplicate"; } *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t));
--- a/src/stream/ngx_stream_script.c Wed Mar 22 22:49:42 2017 +0300 +++ b/src/stream/ngx_stream_script.c Wed Mar 22 22:49:52 2017 +0300 @@ -222,7 +222,7 @@ cv = (ngx_stream_complex_value_t **) (p + cmd->offset); if (*cv != NULL) { - return "duplicate"; + return "is duplicate"; } *cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t));