mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-11 20:53:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix r1903

Browse Source
This commit is contained in:
Igor Sysoev 2008-03-03 20:04:06 +00:00
parent 85d6a3e3db
commit 8efe926dc5
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/http/modules/ngx_http_proxy_module.c
View File

@ -611,6 +611,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->host = u.host;
r->upstream->resolved->port = (in_port_t) (u.no_port ? u.default_port: r->upstream->resolved->port = (in_port_t) (u.no_port ? u.default_port:
u.port); u.port);
r->upstream->resolved->default_port = u.default_port;
return NGX_OK; return NGX_OK;
} }

3
src/http/ngx_http_upstream.c
View File

@ -392,7 +392,8 @@ ngx_http_upstream_init(ngx_http_request_t *r)
uscf = uscfp[i]; uscf = uscfp[i];
if (uscf->host.len == host->len if (uscf->host.len == host->len
&& uscf->port == u->resolved->port && ((uscf->port == 0 && u->resolved->default_port)
|| uscf->port == u->resolved->port)
&& ngx_memcmp(uscf->host.data, host->data, host->len) == 0) && ngx_memcmp(uscf->host.data, host->data, host->len) == 0)
{ {
goto found; goto found;

1
src/http/ngx_http_upstream.h
View File

@ -201,6 +201,7 @@ typedef struct {
typedef struct { typedef struct {
ngx_str_t host; ngx_str_t host;
in_port_t port; in_port_t port;
ngx_uint_t default_port; /* unsigned default_port:1 */
ngx_uint_t naddrs; ngx_uint_t naddrs;
in_addr_t *addrs; in_addr_t *addrs;
ngx_resolver_ctx_t *ctx; ngx_resolver_ctx_t *ctx;