From 42decde7934d0aad10e76c25ae987cf0efd332b0 Mon Sep 17 00:00:00 2001 From: jcgoette Date: Fri, 28 May 2021 22:06:09 -0400 Subject: [PATCH] Treat X-Forwarded-* same --- src/nginxconfig/generators/conf/proxy.conf.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/nginxconfig/generators/conf/proxy.conf.js b/src/nginxconfig/generators/conf/proxy.conf.js index dcedc53..e6eb573 100644 --- a/src/nginxconfig/generators/conf/proxy.conf.js +++ b/src/nginxconfig/generators/conf/proxy.conf.js @@ -1,5 +1,5 @@ /* -Copyright 2020 DigitalOcean +Copyright 2021 DigitalOcean This code is licensed under the MIT License. You may obtain a copy of the License at @@ -38,12 +38,16 @@ export default global => { config['proxy_set_header Forwarded'] = '$proxy_add_forwarded'; if (global.reverseProxy.proxyCoexistenceXForwarded.computed == 'passOn') { config['proxy_set_header X-Forwarded-For'] = '$proxy_add_x_forwarded_for'; + config['proxy_set_header X-Forwarded-Proto'] = '$scheme'; + config['proxy_set_header X-Forwarded-Host'] = '$host'; + config['proxy_set_header X-Forwarded-Port'] = '$server_port'; } else { config['proxy_set_header X-Forwarded-For'] = '""'; + config['proxy_set_header X-Forwarded-Proto'] = '""'; + config['proxy_set_header X-Forwarded-Host'] = '""'; + config['proxy_set_header X-Forwarded-Port'] = '""'; } - config['proxy_set_header X-Forwarded-Proto'] = '$scheme'; - config['proxy_set_header X-Forwarded-Host'] = '$host'; - config['proxy_set_header X-Forwarded-Port'] = '$server_port'; + config['# Proxy timeouts'] = ''; config['proxy_connect_timeout'] = global.reverseProxy.proxyConnectTimeout.computed;