Mercurial > hg > nginx

changeset 6831:014905eb7b3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Map: simplified "map" block parser. No functional changes.
author Ruslan Ermilov <ru@nginx.com>
date Thu, 08 Dec 2016 17:29:01 +0300
parents 6eed5ed31e22
children ec10ce307dc0
files src/http/modules/ngx_http_map_module.c src/stream/ngx_stream_map_module.c
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/http/modules/ngx_http_map_module.c
+++ b/src/http/modules/ngx_http_map_module.c
@@ -393,8 +393,9 @@ ngx_http_map(ngx_conf_t *cf, ngx_command
     {
         ctx->hostnames = 1;
         return NGX_CONF_OK;
+    }
 
-    } else if (cf->args->nelts != 2) {
+    if (cf->args->nelts != 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number of the map parameters");
         return NGX_CONF_ERROR;
--- a/src/stream/ngx_stream_map_module.c
+++ b/src/stream/ngx_stream_map_module.c
@@ -392,8 +392,9 @@ ngx_stream_map(ngx_conf_t *cf, ngx_comma
     {
         ctx->hostnames = 1;
         return NGX_CONF_OK;
+    }
 
-    } else if (cf->args->nelts != 2) {
+    if (cf->args->nelts != 2) {
         ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
                            "invalid number of the map parameters");
         return NGX_CONF_ERROR;