Unified error messages about duplicate directives.

diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
index 6e31a2ade6b4c848d6e08f867c18ab2086fea47f..1bd3ecd5cf11cacc1f5d680ae4c8a683b645b15f 100644 (file)
--- 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 c1a0b4c560b176077f66542096f60a94862ef37a..cc4d67943560f3a86132baac60cc867278ff756a 100644 (file)
--- 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 ff8e655a652b29a816753ef0997b43ab8940f526..aa555ca2c10592944a57ab35030287b9379265ff 100644 (file)
--- 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));