From ddc348dc3912369602ca276bb958d0cbbcedee1b Mon Sep 17 00:00:00 2001 From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com> Date: Mon, 2 Feb 2026 16:32:00 +0100 Subject: [PATCH 1/6] Clarify QUIC and KCP proxy priority in guide Updated the priority behavior of QUIC and KCP proxies in the documentation. --- guide/network/kcp-proxy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/guide/network/kcp-proxy.md b/guide/network/kcp-proxy.md index 2f54c817..e11646ec 100644 --- a/guide/network/kcp-proxy.md +++ b/guide/network/kcp-proxy.md @@ -124,7 +124,7 @@ $ easytier-cli proxy ``` ::: tip 提示 -QUIC 和 KCP 代理可以同时启用，但是 KCP 代理会优先于 QUIC 代理生效。 +QUIC 和 KCP 代理可以同时启用，并且 QUIC 代理会优先于 KCP 代理生效。 -在同时启用后，仅在目的端关闭 KCP 输入后，QUIC 代理才会生效。 +在同时启用后，仅在目的端关闭 QUIC 输入后，KCP 代理才会生效。 ::: From 2951600c76f160339721d829ebe1efa40d39fd23 Mon Sep 17 00:00:00 2001 From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com> Date: Wed, 4 Feb 2026 17:13:52 +0100 Subject: [PATCH 2/6] Reverse precedence of QUIC and KCP proxy notes --- en/guide/network/kcp-proxy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/en/guide/network/kcp-proxy.md b/en/guide/network/kcp-proxy.md index 2a25b2da..4380ff76 100644 --- a/en/guide/network/kcp-proxy.md +++ b/en/guide/network/kcp-proxy.md @@ -120,7 +120,7 @@ $ easytier-cli proxy ``` ::: tip Note -QUIC and KCP proxies can be enabled simultaneously, but KCP proxy takes precedence over QUIC proxy. +QUIC and KCP proxies can be enabled simultaneously, and QUIC proxy takes precedence over KCP proxy. -When both are enabled, QUIC proxy will only take effect after the destination end closes KCP input. +When both are enabled, KCP proxy will only take effect if the destination end doesn't allow QUIC input. ::: From 9995f071327d95265e053eab2213c961815b2371 Mon Sep 17 00:00:00 2001 From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com> Date: Thu, 5 Feb 2026 10:06:43 +0100 Subject: [PATCH 3/6] Update KCP proxy priority information Clarify the priority behavior of QUIC and KCP proxies in version v2.5.0 and older. --- guide/network/kcp-proxy.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/guide/network/kcp-proxy.md b/guide/network/kcp-proxy.md index e11646ec..68f203e1 100644 --- a/guide/network/kcp-proxy.md +++ b/guide/network/kcp-proxy.md @@ -127,4 +127,6 @@ $ easytier-cli proxy QUIC 和 KCP 代理可以同时启用，并且 QUIC 代理会优先于 KCP 代理生效。 在同时启用后，仅在目的端关闭 QUIC 输入后，KCP 代理才会生效。 + +对 v2.5.0 及更旧的版本，优先级相反，即 KCP 会优先于 QUIC 代理生效。 ::: From a5838f4ba563e7d864583bbed0dcb59f1bfd4db7 Mon Sep 17 00:00:00 2001 From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com> Date: Thu, 5 Feb 2026 10:07:43 +0100 Subject: [PATCH 4/6] Update KCP proxy note for QUIC precedence Clarify the precedence of QUIC and KCP proxies in the documentation. --- en/guide/network/kcp-proxy.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/en/guide/network/kcp-proxy.md b/en/guide/network/kcp-proxy.md index 4380ff76..3797dac0 100644 --- a/en/guide/network/kcp-proxy.md +++ b/en/guide/network/kcp-proxy.md @@ -123,4 +123,6 @@ $ easytier-cli proxy QUIC and KCP proxies can be enabled simultaneously, and QUIC proxy takes precedence over KCP proxy. When both are enabled, KCP proxy will only take effect if the destination end doesn't allow QUIC input. + +For v2.5.0 and older, the priority is the inverse, i.e. KCP proxy takes precedence over QUIC proxy. ::: From 22d853d00fbe37973f8801769f894c4396d81e9a Mon Sep 17 00:00:00 2001 From: fanyang Date: Sun, 14 Jun 2026 15:39:22 +0800 Subject: [PATCH 5/6] Clarify KCP and QUIC proxy version behavior --- en/guide/network/kcp-proxy.md | 4 ++-- guide/network/kcp-proxy.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/en/guide/network/kcp-proxy.md b/en/guide/network/kcp-proxy.md index 3797dac0..49cec43f 100644 --- a/en/guide/network/kcp-proxy.md +++ b/en/guide/network/kcp-proxy.md @@ -120,9 +120,9 @@ $ easytier-cli proxy ``` ::: tip Note -QUIC and KCP proxies can be enabled simultaneously, and QUIC proxy takes precedence over KCP proxy. +Starting from v2.6.0, QUIC and KCP proxies can be enabled simultaneously, and QUIC proxy takes precedence over KCP proxy. When both are enabled, KCP proxy will only take effect if the destination end doesn't allow QUIC input. -For v2.5.0 and older, the priority is the inverse, i.e. KCP proxy takes precedence over QUIC proxy. +In v2.5.0 and earlier versions, the priority is reversed, i.e. KCP proxy takes precedence over QUIC proxy. ::: diff --git a/guide/network/kcp-proxy.md b/guide/network/kcp-proxy.md index 68f203e1..a0a10089 100644 --- a/guide/network/kcp-proxy.md +++ b/guide/network/kcp-proxy.md @@ -124,9 +124,9 @@ $ easytier-cli proxy ``` ::: tip 提示 -QUIC 和 KCP 代理可以同时启用，并且 QUIC 代理会优先于 KCP 代理生效。 +自 v2.6.0 起，QUIC 和 KCP 代理可以同时启用，并且 QUIC 代理会优先于 KCP 代理生效。 在同时启用后，仅在目的端关闭 QUIC 输入后，KCP 代理才会生效。 -对 v2.5.0 及更旧的版本，优先级相反，即 KCP 会优先于 QUIC 代理生效。 +在 v2.5.0 及更旧版本中，优先级相反，即 KCP 代理会优先于 QUIC 代理生效。 ::: From ba3f6ebe4e0a4e08c29bfeb572097df27ea091aa Mon Sep 17 00:00:00 2001 From: fanyang Date: Sun, 14 Jun 2026 20:07:59 +0800 Subject: [PATCH 6/6] Refine KCP and QUIC proxy priority wording --- en/guide/network/kcp-proxy.md | 4 ++-- guide/network/kcp-proxy.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/en/guide/network/kcp-proxy.md b/en/guide/network/kcp-proxy.md index 49cec43f..9b5fdb67 100644 --- a/en/guide/network/kcp-proxy.md +++ b/en/guide/network/kcp-proxy.md @@ -120,9 +120,9 @@ $ easytier-cli proxy ``` ::: tip Note -Starting from v2.6.0, QUIC and KCP proxies can be enabled simultaneously, and QUIC proxy takes precedence over KCP proxy. +QUIC and KCP proxies can be enabled simultaneously. -When both are enabled, KCP proxy will only take effect if the destination end doesn't allow QUIC input. +In v2.6.0 and later versions, QUIC proxy takes precedence over KCP proxy. KCP proxy will only take effect if the destination end does not allow QUIC input. In v2.5.0 and earlier versions, the priority is reversed, i.e. KCP proxy takes precedence over QUIC proxy. ::: diff --git a/guide/network/kcp-proxy.md b/guide/network/kcp-proxy.md index a0a10089..665b00ad 100644 --- a/guide/network/kcp-proxy.md +++ b/guide/network/kcp-proxy.md @@ -124,9 +124,9 @@ $ easytier-cli proxy ``` ::: tip 提示 -自 v2.6.0 起，QUIC 和 KCP 代理可以同时启用，并且 QUIC 代理会优先于 KCP 代理生效。 +QUIC 和 KCP 代理可以同时启用。 -在同时启用后，仅在目的端关闭 QUIC 输入后，KCP 代理才会生效。 +在 v2.6.0 及之后版本中，QUIC 代理优先于 KCP 代理生效；仅在目的端关闭 QUIC 输入后，KCP 代理才会生效。 在 v2.5.0 及更旧版本中，优先级相反，即 KCP 代理会优先于 QUIC 代理生效。 :::