[PR #401] [MERGED] merge 0.13 #4190

New issue

Closed

opened 2026-05-05 14:37:23 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:37:23 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/401
Author: @fatedier
Created: 7/14/2017
Status: ✅ Merged
Merged: 7/14/2017
Merged by: @fatedier

Base: dev ← Head: 0.13

📝 Commits (10+)

171bc8d new proxy type: stcp(secret tcp)
07fe05a update version to v0.13.0
b811a62 vhost: fix 404 page
aede4e5 close all proxies if protocol = kcp
b55a24a update mutex used in frpc control
4cc1663 vhost: add real ip in first request of one connection
0752508 vhost: a bug fix of reading request
7bb8c10 plugin: add socks5 plugin
fe32a7c doc: update
c081df4 vendor: add github.com/armon/go-socks5

📊 Changes

43 files changed (+2786 additions, -220 deletions)

View changed files

📝 Godeps/Godeps.json (+8 -0)
📝 README.md (+3 -3)
📝 README_zh.md (+4 -4)
➕ client/admin.go (+60 -0)
➕ client/admin_api.go (+78 -0)
📝 client/control.go (+224 -49)
📝 client/proxy.go (+34 -1)
📝 client/service.go (+18 -3)
➕ client/vistor.go (+145 -0)
📝 cmd/frpc/main.go (+68 -3)
📝 conf/frpc_full.ini (+31 -0)
📝 conf/frps_full.ini (+4 -1)
📝 models/config/client_common.go (+34 -2)
📝 models/config/proxy.go (+225 -8)
📝 models/config/server_common.go (+13 -4)
📝 models/consts/consts.go (+1 -0)
📝 models/msg/msg.go (+31 -11)
➕ models/plugin/socks5.go (+65 -0)
📝 server/control.go (+1 -0)
📝 server/dashboard.go (+14 -100)

...and 23 more files

📄 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/401 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 7/14/2017 **Status:** ✅ Merged **Merged:** 7/14/2017 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `0.13` --- ### 📝 Commits (10+) - [`171bc8d`](https://github.com/fatedier/frp/commit/171bc8dd223da4b28db7a3d237c148f4c4d8c69e) new proxy type: stcp(secret tcp) - [`07fe05a`](https://github.com/fatedier/frp/commit/07fe05a9d5e8937db98232b93eb1207207e6d8ec) update version to v0.13.0 - [`b811a62`](https://github.com/fatedier/frp/commit/b811a620c35eb98464fa3b45120c87eb8ae4b902) vhost: fix 404 page - [`aede4e5`](https://github.com/fatedier/frp/commit/aede4e54f8911a0496049dc3de1edc8f7dbebdde) close all proxies if protocol = kcp - [`b55a24a`](https://github.com/fatedier/frp/commit/b55a24a27e07fcb22c9d8c963cf6b4f84f5d8823) update mutex used in frpc control - [`4cc1663`](https://github.com/fatedier/frp/commit/4cc1663a5f9ce5c6f1db764a3799526221b92f09) vhost: add real ip in first request of one connection - [`0752508`](https://github.com/fatedier/frp/commit/0752508469d81786bf8c5a7b0adb42125906f613) vhost: a bug fix of reading request - [`7bb8c10`](https://github.com/fatedier/frp/commit/7bb8c1064755c0c6ab08922afba51c4422602e31) plugin: add socks5 plugin - [`fe32a7c`](https://github.com/fatedier/frp/commit/fe32a7c4bbfa1c694a537c26740c5440c0751c75) doc: update - [`c081df4`](https://github.com/fatedier/frp/commit/c081df40e1417bbb2b54b96c52a997f548b8d3b3) vendor: add github.com/armon/go-socks5 ### 📊 Changes **43 files changed** (+2786 additions, -220 deletions) <details> <summary>View changed files</summary> 📝 `Godeps/Godeps.json` (+8 -0) 📝 `README.md` (+3 -3) 📝 `README_zh.md` (+4 -4) ➕ `client/admin.go` (+60 -0) ➕ `client/admin_api.go` (+78 -0) 📝 `client/control.go` (+224 -49) 📝 `client/proxy.go` (+34 -1) 📝 `client/service.go` (+18 -3) ➕ `client/vistor.go` (+145 -0) 📝 `cmd/frpc/main.go` (+68 -3) 📝 `conf/frpc_full.ini` (+31 -0) 📝 `conf/frps_full.ini` (+4 -1) 📝 `models/config/client_common.go` (+34 -2) 📝 `models/config/proxy.go` (+225 -8) 📝 `models/config/server_common.go` (+13 -4) 📝 `models/consts/consts.go` (+1 -0) 📝 `models/msg/msg.go` (+31 -11) ➕ `models/plugin/socks5.go` (+65 -0) 📝 `server/control.go` (+1 -0) 📝 `server/dashboard.go` (+14 -100) _...and 23 more files_ </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>