nginx: src/core/ngx_inet.c comparison

Removed a surplus condition from ngx_parse_inet6_url(). No functional changes, since the condition was always true.

comparison

equal deleted inserted replaced

-:b358d670c654
+:19a54ba76c04
 if (p == NULL) {
 u->err = "invalid host";
 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) {
-if (uri) {
+u->err = "invalid host";
-if (u->listen || !u->uri_part) {
+return NGX_ERROR;
-u->err = "invalid host";
+}
-return NGX_ERROR;
-}
+u->uri.len = last - uri;
+u->uri.data = uri;
-u->uri.len = last - uri;
-u->uri.data = uri;
+last = uri;
+}
-last = uri;
-}
+if (port < last) {
+if (*port != ':') {
-if (port < last) {
+u->err = "invalid host";
-if (*port != ':') {
+return NGX_ERROR;
-u->err = "invalid host";
+}
-return NGX_ERROR;
-}
+port++;
-port++;
+len = last - port;
-len = last - port;
+n = ngx_atoi(port, len);
-n = ngx_atoi(port, len);
+if (n < 1 || n > 65535) {
+u->err = "invalid port";
-if (n < 1 || n > 65535) {
+return NGX_ERROR;
-u->err = "invalid port";
+}
-return NGX_ERROR;
-}
+u->port = (in_port_t) n;
+sin6->sin6_port = htons((in_port_t) n);
-u->port = (in_port_t) n;
-sin6->sin6_port = htons((in_port_t) n);
+u->port_text.len = len;
+u->port_text.data = port;
-u->port_text.len = len;
-u->port_text.data = port;
+} else {
+u->no_port = 1;
-} else {
+u->port = u->default_port;
-u->no_port = 1;
+sin6->sin6_port = htons(u->default_port);
-u->port = u->default_port;
-sin6->sin6_port = htons(u->default_port);
-}
 }
 len = p - host;
 if (len == 0) {

Mercurial > hg > nginx