Mercurial > hg > nginx
changeset 2285:c77f4710595c
fix r1913
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Thu, 30 Oct 2008 15:59:10 +0000 |
parents | c3035feb6638 |
children | d795199b41ad |
files | src/http/modules/ngx_http_proxy_module.c src/http/ngx_http_upstream.c src/http/ngx_http_upstream.h |
diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/http/modules/ngx_http_proxy_module.c Fri Oct 24 19:34:24 2008 +0000 +++ b/src/http/modules/ngx_http_proxy_module.c Thu Oct 30 15:59:10 2008 +0000 @@ -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; }
--- a/src/http/ngx_http_upstream.c Fri Oct 24 19:34:24 2008 +0000 +++ b/src/http/ngx_http_upstream.c Thu Oct 30 15:59:10 2008 +0000 @@ -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) {
--- a/src/http/ngx_http_upstream.h Fri Oct 24 19:34:24 2008 +0000 +++ b/src/http/ngx_http_upstream.h Thu Oct 30 15:59:10 2008 +0000 @@ -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;