Mercurial > hg > nginx
changeset 6534:19a54ba76c04
Removed a surplus condition from ngx_parse_inet6_url().
No functional changes, since the condition was always true.
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Wed, 11 May 2016 17:55:30 +0300 |
parents | b358d670c654 |
children | db699978a33f |
files | src/core/ngx_inet.c |
diffstat | 1 files changed, 32 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/src/core/ngx_inet.c Wed May 11 17:55:20 2016 +0300 +++ b/src/core/ngx_inet.c Wed May 11 17:55:30 2016 +0300 @@ -843,52 +843,49 @@ return NGX_ERROR; } - if (last - p) { + port = p + 1; + + uri = ngx_strlchr(port, last, '/'); - port = p + 1; - - uri = ngx_strlchr(port, last, '/'); + if (uri) { + if (u->listen || !u->uri_part) { + u->err = "invalid host"; + return NGX_ERROR; + } - if (uri) { - if (u->listen || !u->uri_part) { - 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 != ':') { + u->err = "invalid host"; + return NGX_ERROR; } - if (port < last) { - if (*port != ':') { - u->err = "invalid host"; - return NGX_ERROR; - } + port++; + + len = last - port; - port++; + n = ngx_atoi(port, len); - len = last - port; - - n = ngx_atoi(port, len); + if (n < 1 || n > 65535) { + u->err = "invalid port"; + return NGX_ERROR; + } - 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 = (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; - u->port = u->default_port; - sin6->sin6_port = htons(u->default_port); - } + } else { + u->no_port = 1; + u->port = u->default_port; + sin6->sin6_port = htons(u->default_port); } len = p - host;