aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-07-23 12:35:21 +0000
committerIgor Sysoev <igor@sysoev.ru>2007-07-23 12:35:21 +0000
commit32b787560ac2d7bd4b15fe2d8d6a4786e00b96e3 (patch)
tree1a725899b84bbd2a9c159cb634f5633d85c092aa
parent5bb2112c27702248e3e6cbb83625821937453b17 (diff)
downloadnginx-32b787560ac2d7bd4b15fe2d8d6a4786e00b96e3.tar.gz
nginx-32b787560ac2d7bd4b15fe2d8d6a4786e00b96e3.zip
fix case when two directives
proxy_pass http://backend; proxy_pass https://backend; both use one port - 80 or 443, that was defined first.
-rw-r--r--src/http/ngx_http_upstream.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c
index 376b85fcd..bc4567458 100644
--- a/src/http/ngx_http_upstream.c
+++ b/src/http/ngx_http_upstream.c
@@ -3209,6 +3209,12 @@ ngx_http_upstream_add(ngx_conf_t *cf, ngx_url_t *u, ngx_uint_t flags)
continue;
}
+ if (uscfp[i]->default_port && u->default_port
+ && uscfp[i]->default_port != u->default_port)
+ {
+ continue;
+ }
+
return uscfp[i];
}