XiaoMo/frp
1
0
Fork 0
mirror of https://github.com/fatedier/frp.git synced 2025-07-27 15:45:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #875 from jettyu/jettyu-websocket

Browse Source 
websocket protocol
This commit is contained in:
fatedier
2018-08-06 15:20:09 +08:00
committed by GitHub
parent b6c219aa97 b8037475ed
commit 64136a3b3e
5 changed files with 177 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
models/config/client_common.go
View File

@@ -187,7 +187,7 @@ func UnmarshalClientConfFromIni(defaultCfg *ClientCommonConf, content string) (c
if tmpStr, ok = conf.Get("common", "protocol"); ok {
// Now it only support tcp and kcp.
if tmpStr != "kcp" {
if tmpStr != "kcp" && tmpStr != "websocket" {
tmpStr = "tcp"
}
cfg.Protocol = tmpStr