Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2007-09-22 22:44:30 +0400
committerIgor Sysoev <igor@sysoev.ru>2007-09-22 22:44:30 +0400
commit0688e927d6f1ecb75155203711cbb73ad07d5345 (patch)
tree04a02f87f3a460a5348876421a90bb87c270c1bd /src/http/modules
parente8c487cde3114c836f083b8ab1201889e8f383a2 (diff)
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.
Diffstat (limited to 'src/http/modules')
-rw-r--r--src/http/modules/ngx_http_proxy_module.c1
1 files changed, 1 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";