From: Gu Feng <flygoast@126.com>
Date: Wed, 17 Sep 2014 14:52:02 +0000 (+0800)
Subject: Avoided to add duplicate hash key in ngx_http_types_slot().
X-Git-Url: http://www.kaiwu.me/postgresql/commit/?a=commitdiff_plain;h=bba2ce8aae96cfc81fa338dde1675397dd3bed4c;p=nginx.git

Avoided to add duplicate hash key in ngx_http_types_slot().
---

diff --git a/src/http/ngx_http.c b/src/http/ngx_http.c
index 31577f9a2..9c8d6cba4 100644
--- a/src/http/ngx_http.c
+++ b/src/http/ngx_http.c
@@ -2005,7 +2005,7 @@ ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
             if (ngx_strcmp(value[i].data, type[n].key.data) == 0) {
                 ngx_conf_log_error(NGX_LOG_WARN, cf, 0,
                                    "duplicate MIME type \"%V\"", &value[i]);
-                continue;
+                goto next;
             }
         }
 
@@ -2017,6 +2017,10 @@ ngx_http_types_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         type->key = value[i];
         type->key_hash = hash;
         type->value = (void *) 4;
+
+    next:
+
+        continue;
     }
 
     return NGX_CONF_OK;