diff options
Diffstat (limited to 'src/core/ngx_inet.c')
| -rw-r--r-- | src/core/ngx_inet.c | 21 |
1 files changed, 2 insertions, 19 deletions
diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c index 16799be51..4acaf4acb 100644 --- a/src/core/ngx_inet.c +++ b/src/core/ngx_inet.c @@ -634,10 +634,7 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u) args = ngx_strlchr(host, last, '?'); if (args) { - if (uri == NULL) { - uri = args; - - } else if (args < uri) { + if (uri == NULL || args < uri) { uri = args; } } @@ -663,11 +660,6 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u) len = last - port; - if (len == 0) { - u->err = "invalid port"; - return NGX_ERROR; - } - n = ngx_atoi(port, len); if (n < 1 || n > 65535) { @@ -774,11 +766,7 @@ ngx_parse_inet_url(ngx_pool_t *pool, ngx_url_t *u) return NGX_OK; } - if (ngx_inet_resolve_host(pool, u) != NGX_OK) { - return NGX_ERROR; - } - - return NGX_OK; + return ngx_inet_resolve_host(pool, u); } @@ -827,11 +815,6 @@ ngx_parse_inet6_url(ngx_pool_t *pool, ngx_url_t *u) len = last - port; - if (len == 0) { - u->err = "invalid port"; - return NGX_ERROR; - } - n = ngx_atoi(port, len); if (n < 1 || n > 65535) { |