Skip to content

Commit fdc3bc1

Browse files
authored
Merge pull request #81 from reload/fix/forward-host-with-port-and-scheme
Forward client Host (with port) and scheme in reverse-proxy templates
2 parents fbb738f + c43599a commit fdc3bc1

4 files changed

Lines changed: 14 additions & 7 deletions

File tree

context/nextjs/etc/nginx/templates/default.conf.template

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ server {
66

77
location / {
88
proxy_pass ${NGINX_PROXY_PASS};
9-
proxy_set_header Host $host;
9+
proxy_set_header Host $http_host;
10+
proxy_set_header X-Forwarded-Proto $scheme;
1011
proxy_set_header X-Real-IP $remote_addr;
1112
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
1213
}
@@ -16,7 +17,8 @@ server {
1617
proxy_http_version 1.1;
1718
proxy_set_header Upgrade $http_upgrade;
1819
proxy_set_header Connection "Upgrade";
19-
proxy_set_header Host $host;
20+
proxy_set_header Host $http_host;
21+
proxy_set_header X-Forwarded-Proto $scheme;
2022
proxy_set_header X-Real-IP $remote_addr;
2123
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
2224
}

context/proxy/etc/nginx/templates/default.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ server {
66

77
location / {
88
proxy_pass ${NGINX_PROXY_PASS};
9-
proxy_set_header Host $host;
9+
proxy_set_header Host $http_host;
10+
proxy_set_header X-Forwarded-Proto $scheme;
1011
proxy_set_header X-Real-IP $remote_addr;
1112
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
1213
# Increase buffer sizes, the defaults can be too tight for

context/storybook/etc/nginx/templates/default.conf.template

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ server {
1111

1212
location / {
1313
proxy_pass ${NGINX_PROXY_PASS};
14-
proxy_set_header Host $host;
14+
proxy_set_header Host $http_host;
15+
proxy_set_header X-Forwarded-Proto $scheme;
1516
proxy_set_header X-Real-IP $remote_addr;
1617
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
1718

@@ -26,7 +27,8 @@ server {
2627
proxy_http_version 1.1;
2728
proxy_set_header Upgrade $http_upgrade;
2829
proxy_set_header Connection "Upgrade";
29-
proxy_set_header Host $host;
30+
proxy_set_header Host $http_host;
31+
proxy_set_header X-Forwarded-Proto $scheme;
3032
proxy_set_header X-Real-IP $remote_addr;
3133
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
3234
}
@@ -36,7 +38,8 @@ server {
3638
proxy_http_version 1.1;
3739
proxy_set_header Upgrade $http_upgrade;
3840
proxy_set_header Connection "Upgrade";
39-
proxy_set_header Host $host;
41+
proxy_set_header Host $http_host;
42+
proxy_set_header X-Forwarded-Proto $scheme;
4043
proxy_set_header X-Real-IP $remote_addr;
4144
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
4245
}

context/vite/etc/nginx/templates/default.conf.template

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ server {
66

77
location / {
88
proxy_pass ${NGINX_PROXY_PASS};
9-
proxy_set_header Host $host;
9+
proxy_set_header Host $http_host;
10+
proxy_set_header X-Forwarded-Proto $scheme;
1011
proxy_set_header X-Real-IP $remote_addr;
1112
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
1213

0 commit comments

Comments
 (0)