# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1225382350 0
# Node ID c77f4710595c23c3344880b346f80c4d739eb36e
# Parent  c3035feb66387a7751c0629c3fc25a98ec3bc99d
fix r1913

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -616,7 +616,7 @@ ngx_http_proxy_eval(ngx_http_request_t *
     r->upstream->resolved->host = u.host;
     r->upstream->resolved->port = (in_port_t) (u.no_port ? u.default_port:
                                                            u.port);
-    r->upstream->resolved->default_port = u.default_port;
+    r->upstream->resolved->no_port = u.no_port;
 
     return NGX_OK;
 }
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -405,7 +405,7 @@ ngx_http_upstream_init(ngx_http_request_
             uscf = uscfp[i];
 
             if (uscf->host.len == host->len
-                && ((uscf->port == 0 && u->resolved->default_port)
+                && ((uscf->port == 0 && u->resolved->no_port)
                      || uscf->port == u->resolved->port)
                 && ngx_memcmp(uscf->host.data, host->data, host->len) == 0)
             {
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -209,7 +209,7 @@ typedef struct {
 typedef struct {
     ngx_str_t                       host;
     in_port_t                       port;
-    ngx_uint_t                      default_port; /* unsigned  default_port:1 */
+    ngx_uint_t                      no_port; /* unsigned  no_port:1 */
     ngx_uint_t                      naddrs;
     in_addr_t                      *addrs;
     ngx_resolver_ctx_t             *ctx;