From 83fd91d7f29a2049b06d87d0d4cedd1531c454aa Mon Sep 17 00:00:00 2001 From: Wataru Maeda Date: Wed, 26 Jun 2024 22:27:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20WebSocket=20=E3=81=AE=E7=96=8E?= =?UTF-8?q?=E9=80=9A=E3=82=92=E6=9A=97=E9=BB=99=E7=9A=84=E3=81=AB=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=81=97?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/config_template_http.erb | 9 ++++++++- src/app/config_template_https.erb | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/src/app/config_template_http.erb b/src/app/config_template_http.erb index 657f22f..b1eb0bc 100644 --- a/src/app/config_template_http.erb +++ b/src/app/config_template_http.erb @@ -14,6 +14,11 @@ map $http_x_forwarded_proto $xfp { "" $scheme; } +map $http_connection $conn { + default keep-alive; + upgrade upgrade; # for HTTP keepalive +} + # --- server definitions for plain HTTP --- server { server_name <%= config.domain %>; @@ -50,7 +55,9 @@ server { grpc_pass $target_upstream; <% else %> proxy_http_version 1.1; - proxy_set_header Connection ""; # for HTTP keepalive + # for WebSocket + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $conn; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $xfp; diff --git a/src/app/config_template_https.erb b/src/app/config_template_https.erb index 33d8eeb..69a7495 100644 --- a/src/app/config_template_https.erb +++ b/src/app/config_template_https.erb @@ -14,6 +14,11 @@ map $http_x_forwarded_proto $xfp { "" $scheme; } +map $http_connection $conn { + default keep-alive; + upgrade upgrade; # for HTTP keepalive +} + # --- server definitions for plain HTTP --- server { server_name <%= config.domain %>; @@ -71,7 +76,9 @@ server { grpc_pass $target_upstream; <% else %> proxy_http_version 1.1; - proxy_set_header Connection ""; # for HTTP keepalive + # for WebSocket + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $conn; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-Proto $xfp; From 599b5dccacc1a82635e881fbca93660d9e793bee Mon Sep 17 00:00:00 2001 From: Wataru Maeda Date: Wed, 26 Jun 2024 22:30:34 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20Connection=E3=83=98=E3=83=83?= =?UTF-8?q?=E3=83=80=E3=81=AE=20map=20=E5=BC=8F=E3=81=AE=E3=82=B3=E3=83=A1?= =?UTF-8?q?=E3=83=B3=E3=83=88=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/config_template_http.erb | 4 ++-- src/app/config_template_https.erb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/config_template_http.erb b/src/app/config_template_http.erb index b1eb0bc..5c0d6fd 100644 --- a/src/app/config_template_http.erb +++ b/src/app/config_template_http.erb @@ -15,8 +15,8 @@ map $http_x_forwarded_proto $xfp { } map $http_connection $conn { - default keep-alive; - upgrade upgrade; # for HTTP keepalive + default keep-alive; # for HTTP keepalive + upgrade upgrade; # for WebSocket } # --- server definitions for plain HTTP --- diff --git a/src/app/config_template_https.erb b/src/app/config_template_https.erb index 69a7495..baead82 100644 --- a/src/app/config_template_https.erb +++ b/src/app/config_template_https.erb @@ -15,8 +15,8 @@ map $http_x_forwarded_proto $xfp { } map $http_connection $conn { - default keep-alive; - upgrade upgrade; # for HTTP keepalive + default keep-alive; # for HTTP keepalive + upgrade upgrade; # for WebSocket } # --- server definitions for plain HTTP ---