Mercurial > hg > nginx-quic
changeset 4721:538363721933 stable-1.2
Merge of r4653: ngx_inet.c code reduction.
Code reduction (no functional changes).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 02 Jul 2012 16:11:02 +0000 |
parents | e92582b7da05 |
children | bb08178f23b0 |
files | src/core/ngx_inet.c |
diffstat | 1 files changed, 2 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- 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 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 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 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, ng len = last - port; - if (len == 0) { - u->err = "invalid port"; - return NGX_ERROR; - } - n = ngx_atoi(port, len); if (n < 1 || n > 65535) {