fix r1913
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; }
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) {
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;