# HG changeset patch
# User Maxim Dounin <mdounin@mdounin.ru>
# Date 1341245462 0
# Node ID 53836372193329a229b415864320c840a930a804
# Parent  e92582b7da0502521581b6966ea743f61c848acc
Merge of r4653: ngx_inet.c code reduction.

Code reduction (no functional changes).

diff --git a/src/core/ngx_inet.c b/src/core/ngx_inet.c
--- 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) {