commit 120131ecb38f91defa56c621c47542cd343a321b
author Ruslan Ermilov <ru@nginx.com> Wed Mar 22 22:49:52 2017 +0300
committer Ruslan Ermilov <ru@nginx.com> Wed Mar 22 22:49:52 2017 +0300
tree 75347e4c9aa9a00b74e2b4f74cb252385db08e90
parent 00fe2ca035cdb082abcca7ce6d6417c00910e61e

Unified error messages about duplicate directives.

src/http/ngx_http_core_module.c

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 6e31a2a..1bd3ecd 100644
--- a/src/http/ngx_http_core_module.c
+++ b/src/http/ngx_http_core_module.c
@@ -4529,7 +4529,7 @@
     ngx_http_core_loc_conf_t  *clcf;
 
     if (pclcf->limit_except) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     pclcf->limit_except = 0xffffffff;

src/http/ngx_http_script.c

diff --git a/src/http/ngx_http_script.c b/src/http/ngx_http_script.c
index c1a0b4c..cc4d679 100644
--- a/src/http/ngx_http_script.c
+++ b/src/http/ngx_http_script.c
@@ -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));

src/stream/ngx_stream_script.c

diff --git a/src/stream/ngx_stream_script.c b/src/stream/ngx_stream_script.c
index ff8e655..aa555ca 100644
--- a/src/stream/ngx_stream_script.c
+++ b/src/stream/ngx_stream_script.c
@@ -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));