diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2007-09-22 18:44:30 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2007-09-22 18:44:30 +0000 |
| commit | 0688e927d6f1ecb75155203711cbb73ad07d5345 (patch) | |
| tree | 04a02f87f3a460a5348876421a90bb87c270c1bd | |
| parent | e8c487cde3114c836f083b8ab1201889e8f383a2 (diff) | |
| download | nginx-0688e927d6f1ecb75155203711cbb73ad07d5345.tar.gz nginx-0688e927d6f1ecb75155203711cbb73ad07d5345.tar.bz2 | |
r1340, r1341 merge:
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/modules/ngx_http_proxy_module.c | 1 | ||||
| -rw-r--r-- | src/http/ngx_http_upstream.c | 6 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/http/modules/ngx_http_proxy_module.c b/src/http/modules/ngx_http_proxy_module.c index c8dca82ae..52f67b305 100644 --- a/src/http/modules/ngx_http_proxy_module.c +++ b/src/http/modules/ngx_http_proxy_module.c @@ -2237,6 +2237,7 @@ ngx_http_proxy_pass(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) if (port == 80) { plcf->port.len = sizeof("80") - 1; plcf->port.data = (u_char *) "80"; + } else { plcf->port.len = sizeof("443") - 1; plcf->port.data = (u_char *) "443"; 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]; } |