From 152dd028c62d059543c4902412349eaa445a8a33 Mon Sep 17 00:00:00 2001 From: xqzr <34030394+xqzr@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:38:28 +0800 Subject: [PATCH 1/4] Update README.md --- Trojan-gRPC-Caddy2／Nginx/README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Trojan-gRPC-Caddy2／Nginx/README.md b/Trojan-gRPC-Caddy2／Nginx/README.md index 198e1c9..549efad 100644 --- a/Trojan-gRPC-Caddy2／Nginx/README.md +++ b/Trojan-gRPC-Caddy2／Nginx/README.md @@ -7,8 +7,8 @@ Xray client <--- gRPC(TLS) ---> Caddy2 <--- gRPC(cleartext) ---> Xray server 同时，您也可以选择使用 Nginx。示例配置片段如下（部分来自 [@xqzr](https://github.com/xqzr)）： ```conf server { - listen 443 ssl http2 so_keepalive=on; - listen [::]:443 ssl http2 so_keepalive=on; + listen 443 ssl http2; + listen [::]:443 ssl http2; server_name example.com; index index.html; @@ -19,8 +19,8 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; - client_header_timeout 52w; - keepalive_timeout 52w; + client_header_timeout 1w; + keepalive_timeout 5d; # 在 location 后填写 /你的 ServiceName location /你的 ServiceName { if ($content_type !~ "application/grpc") { @@ -29,8 +29,9 @@ server { client_max_body_size 0; client_body_buffer_size 512k; grpc_set_header X-Real-IP $remote_addr; - client_body_timeout 52w; - grpc_read_timeout 52w; + client_body_timeout 1w; + grpc_read_timeout 1w; + grpc_send_timeout 1w; grpc_pass unix:/dev/shm/Xray-Trojan-gRPC.socket; } } From 33595f9c0dd1bd41ed7b6d0192286065c6505205 Mon Sep 17 00:00:00 2001 From: xqzr <34030394+xqzr@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:40:36 +0800 Subject: [PATCH 2/4] Update README.ENG.md --- Trojan-gRPC-Caddy2／Nginx/README.ENG.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Trojan-gRPC-Caddy2／Nginx/README.ENG.md b/Trojan-gRPC-Caddy2／Nginx/README.ENG.md index ce688cc..89d96b7 100644 --- a/Trojan-gRPC-Caddy2／Nginx/README.ENG.md +++ b/Trojan-gRPC-Caddy2／Nginx/README.ENG.md @@ -5,8 +5,8 @@ Xray client <--- gRPC(TLS) ---> Caddy2 <--- gRPC(cleartext) ---> Xray server At the same time, you can also choose to use Nginx. A sample configuration snippet is as follows (partially from [@xqzr](https://github.com/xqzr)): ```conf server { -listen 443 ssl http2 so_keepalive=on; - listen [::]:443 ssl http2 so_keepalive=on; +listen 443 ssl http2; + listen [::]:443 ssl http2; server_name example.com; index index.html; @@ -17,8 +17,8 @@ ssl_certificate_key /path/to/example.key; ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE -RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; -client_header_timeout 52w; - keepalive_timeout 52w; +client_header_timeout 1w; + keepalive_timeout 5d; # Fill in /your ServiceName after location location /your ServiceName { if ($content_type !~ "application/grpc") { @@ -27,8 +27,9 @@ return 404; client_max_body_size 0; client_body_buffer_size 512k; grpc_set_header X-Real-IP $remote_addr; -client_body_timeout 52w; -grpc_read_timeout 52w; +client_body_timeout 1w; +grpc_read_timeout 1w; +grpc_send_timeout 1w; grpc_pass unix:/dev/shm/Xray-Trojan-gRPC.socket; } } From 5ee22a1aa45d65b091deadc0a96b8f1b75084205 Mon Sep 17 00:00:00 2001 From: xqzr <34030394+xqzr@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:42:25 +0800 Subject: [PATCH 3/4] Update README.md --- VLESS-GRPC/README.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/VLESS-GRPC/README.md b/VLESS-GRPC/README.md index 1a83e16..453b739 100644 --- a/VLESS-GRPC/README.md +++ b/VLESS-GRPC/README.md @@ -7,8 +7,8 @@ Xray client <--- gRPC(TLS) ---> Caddy2 <--- gRPC(cleartext) ---> Xray server 同时，您也可以选择使用 Nginx。示例配置片段如下（部分来自 [@xqzr](https://github.com/xqzr)）： ```conf server { - listen 443 ssl http2 so_keepalive=on; - listen [::]:443 ssl http2 so_keepalive=on; + listen 443 ssl http2; + listen [::]:443 ssl http2; server_name example.com; index index.html; @@ -19,8 +19,8 @@ server { ssl_protocols TLSv1.2 TLSv1.3; ssl_ciphers ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES256-GCM-SHA384; - client_header_timeout 52w; - keepalive_timeout 52w; + client_header_timeout 1w; + keepalive_timeout 5d; # 在 location 后填写 /你的 ServiceName location /你的 ServiceName { if ($content_type !~ "application/grpc") { @@ -29,8 +29,9 @@ server { client_max_body_size 0; client_body_buffer_size 512k; grpc_set_header X-Real-IP $remote_addr; - client_body_timeout 52w; - grpc_read_timeout 52w; + client_body_timeout 1w; + grpc_read_timeout 1w; + grpc_send_timeout 1w; grpc_pass unix:/dev/shm/Xray-VLESS-gRPC.socket; } } From a736984061c56bcc268159672060bdf70411e3c2 Mon Sep 17 00:00:00 2001 From: xqzr <34030394+xqzr@users.noreply.github.com> Date: Mon, 4 Dec 2023 17:42:52 +0800 Subject: [PATCH 4/4] Update nginx.conf --- VLESS-WSS-Nginx/nginx.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VLESS-WSS-Nginx/nginx.conf b/VLESS-WSS-Nginx/nginx.conf index bb76235..492c4c2 100644 --- a/VLESS-WSS-Nginx/nginx.conf +++ b/VLESS-WSS-Nginx/nginx.conf @@ -23,6 +23,6 @@ server { proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_read_timeout 52w; + proxy_read_timeout 5d; } }