Mercurial > hg > nginx
changeset 4652:215857d53cbe
Code reduction (no functional changes).
author | Ruslan Ermilov <ru@nginx.com> |
---|---|
date | Fri, 01 Jun 2012 11:35:09 +0000 |
parents | 3797a44d1fa9 |
children | 134ccdf44647 |
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 Wed May 30 12:43:27 2012 +0000 +++ b/src/core/ngx_inet.c Fri Jun 01 11:35:09 2012 +0000 @@ -634,10 +634,7 @@ 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 @@ 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 @@ 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 @@ len = last - port; - if (len == 0) { - u->err = "invalid port"; - return NGX_ERROR; - } - n = ngx_atoi(port, len); if (n < 1 || n > 65535) {