# HG changeset patch
# User Ruslan Ermilov <ru@nginx.com>
# Date 1490212192 -10800
# Node ID 39ff6939266e913e8bfd400e60f9520e70725a4d
# Parent  633a36655bb6817dab249b32775beb142d4270a3
Unified error messages about duplicate directives.

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_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 @@
     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 @@
     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));