[PR #886] [MERGED] Connect protocol support websocket #4269

New issue

Closed

opened 2026-05-05 14:38:52 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:38:52 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/886
Author: @fatedier
Created: 8/10/2018
Status: ✅ Merged
Merged: 8/10/2018
Merged by: @fatedier

Base: dev ← Head: websocket

📝 Commits (6)

b803747 websocket protocol
64136a3 Merge pull request #875 from jettyu/jettyu-websocket
7793f55 websocket: update muxer for websocket
f645082 vendor: add package golang.org/x/net/websocket
941ac25 fix ci
0762302 websocket: fix

📊 Changes

12 files changed (+1480 additions, -57 deletions)

View changed files

📝 Gopkg.lock (+4 -3)
📝 conf/frpc_full.ini (+1 -1)
📝 models/config/client_common.go (+4 -3)
📝 server/service.go (+22 -10)
📝 utils/net/conn.go (+66 -34)
➕ utils/net/websocket.go (+105 -0)
📝 vendor/github.com/fatedier/golib/net/mux/mux.go (+4 -6)
➕ vendor/golang.org/x/net/websocket/client.go (+106 -0)
➕ vendor/golang.org/x/net/websocket/dial.go (+24 -0)
➕ vendor/golang.org/x/net/websocket/hybi.go (+583 -0)
➕ vendor/golang.org/x/net/websocket/server.go (+113 -0)
➕ vendor/golang.org/x/net/websocket/websocket.go (+448 -0)

📄 Description

No description provided

_{🔄 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/886 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 8/10/2018 **Status:** ✅ Merged **Merged:** 8/10/2018 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `websocket` --- ### 📝 Commits (6) - [`b803747`](https://github.com/fatedier/frp/commit/b8037475ed8c5a6c9e99f5fdbc69fd0c306c1805) websocket protocol - [`64136a3`](https://github.com/fatedier/frp/commit/64136a3b3e01b61293c5925f5acbefb2cbbc1dd7) Merge pull request #875 from jettyu/jettyu-websocket - [`7793f55`](https://github.com/fatedier/frp/commit/7793f5554518d785d1b69b3818ece4d001972907) websocket: update muxer for websocket - [`f645082`](https://github.com/fatedier/frp/commit/f645082d72383c73215ffead17249a748e1e40ec) vendor: add package golang.org/x/net/websocket - [`941ac25`](https://github.com/fatedier/frp/commit/941ac256484baf44289334ad70bcc3c941b6600a) fix ci - [`0762302`](https://github.com/fatedier/frp/commit/07623027bcf310d3454554fb35bdad77fa639985) websocket: fix ### 📊 Changes **12 files changed** (+1480 additions, -57 deletions) <details> <summary>View changed files</summary> 📝 `Gopkg.lock` (+4 -3) 📝 `conf/frpc_full.ini` (+1 -1) 📝 `models/config/client_common.go` (+4 -3) 📝 `server/service.go` (+22 -10) 📝 `utils/net/conn.go` (+66 -34) ➕ `utils/net/websocket.go` (+105 -0) 📝 `vendor/github.com/fatedier/golib/net/mux/mux.go` (+4 -6) ➕ `vendor/golang.org/x/net/websocket/client.go` (+106 -0) ➕ `vendor/golang.org/x/net/websocket/dial.go` (+24 -0) ➕ `vendor/golang.org/x/net/websocket/hybi.go` (+583 -0) ➕ `vendor/golang.org/x/net/websocket/server.go` (+113 -0) ➕ `vendor/golang.org/x/net/websocket/websocket.go` (+448 -0) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>