Merge pull request #4956 from djboris9/proxy-protocol-port

Fix proxy protocol support for X-Forwarded-Port
This commit is contained in:
Kubernetes Prow Robot 2020-01-26 12:27:02 -08:00 committed by GitHub
commit 2f8cbeb8fa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View file

@ -105,7 +105,6 @@ end
-- phases or redirection
function _M.rewrite(location_config)
ngx.var.pass_access_scheme = ngx.var.scheme
ngx.var.pass_server_port = ngx.var.server_port
ngx.var.best_http_host = ngx.var.http_host or ngx.var.host
if config.use_forwarded_headers then

View file

@ -1021,7 +1021,13 @@ stream {
set $proxy_upstream_name {{ buildUpstreamName $location | quote }};
set $proxy_host $proxy_upstream_name;
set $pass_access_scheme $scheme;
{{ if $all.Cfg.UseProxyProtocol }}
set $pass_server_port $proxy_protocol_server_port;
{{ else }}
set $pass_server_port $server_port;
{{ end }}
set $best_http_host $http_host;
set $pass_port $pass_server_port;