| commit | 32b787560ac2d7bd4b15fe2d8d6a4786e00b96e3 | [log] [tgz] |
|---|---|---|
| author | Igor Sysoev <igor@sysoev.ru> | Mon Jul 23 12:35:21 2007 +0000 |
| committer | Igor Sysoev <igor@sysoev.ru> | Mon Jul 23 12:35:21 2007 +0000 |
| tree | 1a725899b84bbd2a9c159cb634f5633d85c092aa | |
| parent | 5bb2112c27702248e3e6cbb83625821937453b17 [diff] |
fix case when two directives
proxy_pass http://backend;
proxy_pass https://backend;
both use one port - 80 or 443, that was defined first.
diff --git a/src/http/ngx_http_upstream.c b/src/http/ngx_http_upstream.c index 376b85f..bc45674 100644 --- a/src/http/ngx_http_upstream.c +++ b/src/http/ngx_http_upstream.c
@@ -3209,6 +3209,12 @@ continue; } + if (uscfp[i]->default_port && u->default_port + && uscfp[i]->default_port != u->default_port) + { + continue; + } + return uscfp[i]; }