[nginx] Unified error messages about duplicate directives.

[Ruslan Ermilov]

details:   http://hg.nginx.org/nginx/rev/39ff6939266e
branches:  
changeset: 6940:39ff6939266e
user:      Ruslan Ermilov <ru at nginx.com>
date:      Wed Mar 22 22:49:52 2017 +0300
description:
Unified error messages about duplicate directives.

diffstat:

 src/http/ngx_http_core_module.c |  2 +-
 src/http/ngx_http_script.c      |  2 +-
 src/stream/ngx_stream_script.c  |  2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diffs (36 lines):

diff -r 633a36655bb6 -r 39ff6939266e src/http/ngx_http_core_module.c
--- 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_limit_except(ngx_conf_t *c
     ngx_http_core_loc_conf_t  *clcf;
 
     if (pclcf->limit_except) {
-        return "duplicate";
+        return "is duplicate";
     }
 
     pclcf->limit_except = 0xffffffff;
diff -r 633a36655bb6 -r 39ff6939266e src/http/ngx_http_script.c
--- 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 @@ ngx_http_set_complex_value_slot(ngx_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 -r 633a36655bb6 -r 39ff6939266e src/stream/ngx_stream_script.c
--- 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 @@ ngx_stream_set_complex_value_slot(ngx_co
     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));