diff options
| author | Ruslan Ermilov <ru@nginx.com> | 2017-03-22 22:49:52 +0300 |
|---|---|---|
| committer | Ruslan Ermilov <ru@nginx.com> | 2017-03-22 22:49:52 +0300 |
| commit | abc9d62b03d92129c86f36f068d368e81f89db4e (patch) | |
| tree | 75347e4c9aa9a00b74e2b4f74cb252385db08e90 /src | |
| parent | a10267126c8cf242ad1d07e7aaa515a40a767e81 (diff) | |
| download | nginx-abc9d62b03d92129c86f36f068d368e81f89db4e.tar.gz nginx-abc9d62b03d92129c86f36f068d368e81f89db4e.zip | |
Unified error messages about duplicate directives.
Diffstat (limited to 'src')
| -rw-r--r-- | src/http/ngx_http_core_module.c | 2 | ||||
| -rw-r--r-- | src/http/ngx_http_script.c | 2 | ||||
| -rw-r--r-- | src/stream/ngx_stream_script.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c index 6e31a2ade..1bd3ecd5c 100644 --- a/src/http/ngx_http_core_module.c +++ b/src/http/ngx_http_core_module.c @@ -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; if (pclcf->limit_except) { - return "duplicate"; + return "is duplicate"; } pclcf->limit_except = 0xffffffff; diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c index c1a0b4c56..cc4d67943 100644 --- a/src/http/ngx_http_script.c +++ b/src/http/ngx_http_script.c @@ -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); if (*cv != NULL) { - return "duplicate"; + return "is duplicate"; } *cv = ngx_palloc(cf->pool, sizeof(ngx_http_complex_value_t)); diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c index ff8e655a6..aa555ca2c 100644 --- a/src/stream/ngx_stream_script.c +++ b/src/stream/ngx_stream_script.c @@ -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); if (*cv != NULL) { - return "duplicate"; + return "is duplicate"; } *cv = ngx_palloc(cf->pool, sizeof(ngx_stream_complex_value_t)); |