mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed a surplus condition from ngx_parse_inet6_url().

Browse Source 
No functional changes, since the condition was always true.
This commit is contained in:
Ruslan Ermilov 2016-05-11 17:55:30 +03:00
parent 66be8c6608
commit 41d512c069
1 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/core/ngx_inet.c
View File

@ -843,52 +843,49 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u)
return NGX_ERROR; 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;
last = uri;
} }
if (port < last) { u->uri.len = last - uri;
if (*port != ':') { u->uri.data = uri;
u->err = "invalid host";
return NGX_ERROR;
}
port++; last = uri;
}
len = last - port; if (port < last) {
if (*port != ':') {
n = ngx_atoi(port, len); u->err = "invalid host";
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_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);
} }
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; len = p - host;