[PR #3503] [MERGED] support wss between frpc and frps #4764

New issue

Closed

opened 2026-05-05 14:48:20 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:48:20 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/3503
Author: @fatedier
Created: 6/28/2023
Status: ✅ Merged
Merged: 6/29/2023
Merged by: @fatedier

Base: dev ← Head: wss

📝 Commits (1)

3d54dc0 support wss between frpc and frps

📊 Changes

10 files changed (+116 additions, -42 deletions)

View changed files

📝 Release.md (+2 -13)
📝 client/service.go (+21 -8)
📝 cmd/frpc/sub/root.go (+5 -2)
📝 conf/frpc_full.ini (+1 -1)
📝 go.mod (+4 -1)
📝 go.sum (+4 -4)
📝 pkg/config/client.go (+3 -2)
📝 pkg/util/net/dial.go (+8 -2)
📝 test/e2e/basic/basic.go (+13 -5)
📝 test/e2e/basic/client_server.go (+55 -4)

📄 Description

Fix #3162
Fix #2119

This PR also fixes an issue in which part of the wss protocol could not be forwarded correctly in the plugin due to yamux.

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/fatedier/frp/pull/3503 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 6/28/2023 **Status:** ✅ Merged **Merged:** 6/29/2023 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `wss` --- ### 📝 Commits (1) - [`3d54dc0`](https://github.com/fatedier/frp/commit/3d54dc026833dd7ad404225ce2dfff9aae3b6b1c) support wss between frpc and frps ### 📊 Changes **10 files changed** (+116 additions, -42 deletions) <details> <summary>View changed files</summary> 📝 `Release.md` (+2 -13) 📝 `client/service.go` (+21 -8) 📝 `cmd/frpc/sub/root.go` (+5 -2) 📝 `conf/frpc_full.ini` (+1 -1) 📝 `go.mod` (+4 -1) 📝 `go.sum` (+4 -4) 📝 `pkg/config/client.go` (+3 -2) 📝 `pkg/util/net/dial.go` (+8 -2) 📝 `test/e2e/basic/basic.go` (+13 -5) 📝 `test/e2e/basic/client_server.go` (+55 -4) </details> ### 📄 Description Fix #3162 Fix #2119 This PR also fixes an issue in which part of the wss protocol could not be forwarded correctly in the plugin due to yamux. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>