# HG changeset patch
# User Igor Sysoev <igor@sysoev.ru>
# Date 1204574646 0
# Node ID 68b426b43c31304f18a931e506a0fd4919230ef7
# Parent  ade85ba3167421c5250bad9b9f08647bb76056fc
fix r1903

diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c
--- a/src/http/modules/ngx_http_proxy_module.c
+++ b/src/http/modules/ngx_http_proxy_module.c
@@ -611,6 +611,7 @@ ngx_http_proxy_eval(ngx_http_request_t *
     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;
 
     return NGX_OK;
 }
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -392,7 +392,8 @@ ngx_http_upstream_init(ngx_http_request_
             uscf = uscfp[i];
 
             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)
             {
                 goto found;
diff --git a/src/http/ngx_http_upstream.h b/src/http/ngx_http_upstream.h
--- a/src/http/ngx_http_upstream.h
+++ b/src/http/ngx_http_upstream.h
@@ -201,6 +201,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                      naddrs;
     in_addr_t                      *addrs;
     ngx_resolver_ctx_t             *ctx;