commit af8d9c69f32636fce770db478cbf010fca60487d
author Ruslan Ermilov <ru@nginx.com> Wed May 11 17:55:30 2016 +0300
committer Ruslan Ermilov <ru@nginx.com> Wed May 11 17:55:30 2016 +0300
tree 5a6313b4ab577c76b743670226bb9cbeb41066df
parent d61fb5d271daea3c05f539d84e2ba2e7e59daad5

Removed a surplus condition from ngx_parse_inet6_url().

No functional changes, since the condition was always true.

src/core/ngx_inet.c

diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
index d5b7cf9..2ed4a14 100644
--- a/src/core/ngx_inet.c
+++ b/src/core/ngx_inet.c
@@ -843,52 +843,49 @@
         return NGX_ERROR;
     }
 
-    if (last - p) {
+    port = p + 1;
 
-        port = p + 1;
+    uri = ngx_strlchr(port, last, '/');
 
-        uri = ngx_strlchr(port, last, '/');
-
-        if (uri) {
-            if (u->listen || !u->uri_part) {
-                u->err = "invalid host";
-                return NGX_ERROR;
-            }
-
-            u->uri.len = last - uri;
-            u->uri.data = uri;
-
-            last = uri;
+    if (uri) {
+        if (u->listen || !u->uri_part) {
+            u->err = "invalid host";
+            return NGX_ERROR;
         }
 
-        if (port < last) {
-            if (*port != ':') {
-                u->err = "invalid host";
-                return NGX_ERROR;
-            }
+        u->uri.len = last - uri;
+        u->uri.data = uri;
 
-            port++;
+        last = uri;
+    }
 
-            len = last - port;
-
-            n = ngx_atoi(port, len);
-
-            if (n < 1 || n > 65535) {
-                u->err = "invalid port";
-                return NGX_ERROR;
-            }
-
-            u->port = (in_port_t) n;
-            sin6->sin6_port = htons((in_port_t) n);
-
-            u->port_text.len = len;
-            u->port_text.data = port;
-
-        } else {
-            u->no_port = 1;
-            u->port = u->default_port;
-            sin6->sin6_port = htons(u->default_port);
+    if (port < last) {
+        if (*port != ':') {
+            u->err = "invalid host";
+            return NGX_ERROR;
         }
+
+        port++;
+
+        len = last - port;
+
+        n = ngx_atoi(port, len);
+
+        if (n < 1 || n > 65535) {
+            u->err = "invalid port";
+            return NGX_ERROR;
+        }
+
+        u->port = (in_port_t) n;
+        sin6->sin6_port = htons((in_port_t) n);
+
+        u->port_text.len = len;
+        u->port_text.data = port;
+
+    } else {
+        u->no_port = 1;
+        u->port = u->default_port;
+        sin6->sin6_port = htons(u->default_port);
     }
 
     len = p - host;