Change proxy protocol handling for X-Forwareded-Port

Suggestion from kubernetes#4951 (comment)
djboris9 · Jan 22, 2020 · 76179f7 · 76179f7
1 parent 2a332cc
commit 76179f7
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl
@@ -1032,7 +1032,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    $server_port;
+            {{ else }}
+            set $pass_server_port    $proxy_protocol_server_port;
+            {{ end }}
+
             set $best_http_host      $http_host;
             set $pass_port           $pass_server_port;
 
@@ -1152,7 +1158,7 @@ stream {
             {{ $proxySetHeader }} X-Forwarded-For        $remote_addr;
             {{ end }}
             {{ $proxySetHeader }} X-Forwarded-Host       $best_http_host;
-            {{ $proxySetHeader }} X-Forwarded-Port       $proxy_protocol_server_port;
+            {{ $proxySetHeader }} X-Forwarded-Port       $pass_port;
             {{ $proxySetHeader }} X-Forwarded-Proto      $pass_access_scheme;
             {{ if $all.Cfg.ProxyAddOriginalURIHeader }}
             {{ $proxySetHeader }} X-Original-URI         $request_uri;