commit 694c84975dd097f60239b4cbd8c06af29f4140c0
author Igor Sysoev <igor@sysoev.ru> Thu Oct 30 15:59:10 2008 +0000
committer Igor Sysoev <igor@sysoev.ru> Thu Oct 30 15:59:10 2008 +0000
tree 77b5717e1ff0d3e23c25208bb595c68a371dfdad
parent 164abfb26f0f98155d11d8b41567f5b42575bb04

fix r1913

src/http/modules/ngx_http_proxy_module.c

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 83784ea..5e98ad9 100644
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -616,7 +616,7 @@
     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;
 }

src/http/ngx_http_upstream.c

diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 9144913..c3fc861 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -405,7 +405,7 @@
             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)
             {

src/http/ngx_http_upstream.h

diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
index dd72ba8..c87bcdc 100644
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -209,7 +209,7 @@
 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;