From 8dea98f795f9f1623778ea7286041c1783f7714f Mon Sep 17 00:00:00 2001 From: WJQSERVER Date: Sat, 30 Nov 2024 17:49:28 +0800 Subject: [PATCH] 1.7.6 --- CHANGELOG.md | 7 +++++++ README.md | 2 +- caddyfile/nocache/Caddyfile | 3 +++ caddyfile/release/Caddyfile | 8 +++++++- docker/dockerfile/nocache/config.toml | 2 +- 5 files changed, 19 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f9fd400..8b0c48f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # 更新日志 +v1.7.6 +--- +- RELEASE: 版本在v1.7.4及以上的用户,我们建议升级到此版本以解决于v1.7.4版本功能更新所引入的问题 +- FIX: 进一步修正 H2C相关配置逻辑问题 +- CHANGE: 对Caddy配置进行实验性修改,优化H2C配置 +- CHANGE: 更新相关依赖库 + 24w25b --- - PRE-RELEASE: 此版本是v1.7.6的预发布版本,请勿在生产环境中使用 diff --git a/README.md b/README.md index 638ec6c..03ca5ac 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ wget -O install.sh https://raw.githubusercontent.com/WJQSERVER-STUDIO/ghproxy/ma host = "127.0.0.1" # 监听地址 port = 8080 # 监听端口 sizeLimit = 125 # 125MB -enableH2C = true # 是否开启H2C传输(latest和dev版本请开启) +enableH2C = "on" # 是否开启H2C传输(latest和dev版本请开启) on/off [pages] enabled = false # 是否开启内置静态页面(Docker版本请关闭此项) diff --git a/caddyfile/nocache/Caddyfile b/caddyfile/nocache/Caddyfile index db1fe4b..b63e936 100644 --- a/caddyfile/nocache/Caddyfile +++ b/caddyfile/nocache/Caddyfile @@ -13,6 +13,9 @@ roll_keep 10 } } + servers :80 { + protocols h1 h2c + } } diff --git a/caddyfile/release/Caddyfile b/caddyfile/release/Caddyfile index 9fc8120..962fa39 100644 --- a/caddyfile/release/Caddyfile +++ b/caddyfile/release/Caddyfile @@ -13,6 +13,9 @@ roll_keep 10 } } + servers :80 { + protocols h1 h2c + } } (log) { @@ -68,8 +71,11 @@ :80 { reverse_proxy { - to h2c://127.0.0.1:8080 + to 127.0.0.1:8080 import header_realip + transport http { + versions 1.1 h2c + } } import log ghproxy import cache 0s 300s diff --git a/docker/dockerfile/nocache/config.toml b/docker/dockerfile/nocache/config.toml index ed8a857..99147a8 100644 --- a/docker/dockerfile/nocache/config.toml +++ b/docker/dockerfile/nocache/config.toml @@ -2,7 +2,7 @@ host = "0.0.0.0" port = 80 #修改此配置会导致容器异常 sizeLimit = 125 # MB -enableH2C = false +enableH2C = "off" # on / off [pages] enabled = true