fix r1913

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
index 83784eac76d24f45a049de932876f9b168bedd17..5e98ad9d4cc1c0bb15bada71fed8c9faf7ddf2c2 100644 (file)
--- 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, ngx_http_proxy_ctx_t *ctx,
     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
index 9144913be94fec46dfa3e8f3ee105a4a0934d8f9..c3fc8612cde2120a1a97a0e5706f4b24755d948b 100644 (file)
--- 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_t *r)
             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
index dd72ba86da3e7f319203e90ac2e4f2bdf84eef71..c87bcdc5778bf7488e3c6eb955f96903cd7668e5 100644 (file)
--- 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;