[PR #1190] [MERGED] new features #4339

New issue

Closed

opened 2026-05-05 14:40:11 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:40:11 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/1190
Author: @fatedier
Created: 4/10/2019
Status: ✅ Merged
Merged: 4/10/2019
Merged by: @fatedier

Base: dev ← Head: new

📝 Commits (8)

74a8752 fix route conflict
9c4ec56 support proxy protocol
79237d2 bump version to v0.26.0
7f9d88c fix
b7a73d3 support proxy protocol for type http
c67b4e7 vendor: add packages
db6bbc5 frpc: new plugin https2http
988e9b1 update doc

📊 Changes

34 files changed (+1179 additions, -41 deletions)

View changed files

📝 README.md (+51 -4)
📝 README_zh.md (+60 -2)
📝 client/control.go (+8 -1)
📝 client/proxy/proxy.go (+45 -13)
📝 client/proxy/proxy_manager.go (+2 -2)
📝 client/proxy/proxy_wrapper.go (+2 -2)
📝 cmd/frpc/sub/root.go (+1 -1)
📝 cmd/frps/root.go (+1 -1)
📝 conf/frpc_full.ini (+12 -0)
📝 go.mod (+1 -0)
📝 go.sum (+2 -0)
📝 models/config/proxy.go (+12 -2)
📝 models/msg/msg.go (+4 -0)
➕ models/plugin/https2http.go (+119 -0)
📝 server/control.go (+1 -0)
📝 server/proxy/http.go (+13 -2)
📝 server/proxy/https.go (+4 -0)
📝 server/proxy/proxy.go (+26 -3)
📝 server/proxy/udp.go (+1 -1)
📝 server/proxy/xtcp.go (+1 -1)

...and 14 more files

📄 Description

Fix route conflict.
Support proxy protocol.
New plugin https2http.

_{🔄 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/1190 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 4/10/2019 **Status:** ✅ Merged **Merged:** 4/10/2019 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `new` --- ### 📝 Commits (8) - [`74a8752`](https://github.com/fatedier/frp/commit/74a87525702cffa0da01f2a4a3e280d9e4290fbd) fix route conflict - [`9c4ec56`](https://github.com/fatedier/frp/commit/9c4ec56491efd534b9eac98155c76455cc9b329e) support proxy protocol - [`79237d2`](https://github.com/fatedier/frp/commit/79237d2b94c934f18da45a8ee82b3010745b60f0) bump version to v0.26.0 - [`7f9d88c`](https://github.com/fatedier/frp/commit/7f9d88c10ab03522637769a4e1ba65233ed3e6ec) fix - [`b7a73d3`](https://github.com/fatedier/frp/commit/b7a73d34692a8481feba53da4944814f733d10d7) support proxy protocol for type http - [`c67b4e7`](https://github.com/fatedier/frp/commit/c67b4e7b9465f6cf2e8d9b6573b2ab3100824ef4) vendor: add packages - [`db6bbc5`](https://github.com/fatedier/frp/commit/db6bbc5187614dd1692a84f2e5d1fb5a17315085) frpc: new plugin https2http - [`988e9b1`](https://github.com/fatedier/frp/commit/988e9b1de3eb54c0c11dee85c4cbb11c7a0b0fb7) update doc ### 📊 Changes **34 files changed** (+1179 additions, -41 deletions) <details> <summary>View changed files</summary> 📝 `README.md` (+51 -4) 📝 `README_zh.md` (+60 -2) 📝 `client/control.go` (+8 -1) 📝 `client/proxy/proxy.go` (+45 -13) 📝 `client/proxy/proxy_manager.go` (+2 -2) 📝 `client/proxy/proxy_wrapper.go` (+2 -2) 📝 `cmd/frpc/sub/root.go` (+1 -1) 📝 `cmd/frps/root.go` (+1 -1) 📝 `conf/frpc_full.ini` (+12 -0) 📝 `go.mod` (+1 -0) 📝 `go.sum` (+2 -0) 📝 `models/config/proxy.go` (+12 -2) 📝 `models/msg/msg.go` (+4 -0) ➕ `models/plugin/https2http.go` (+119 -0) 📝 `server/control.go` (+1 -0) 📝 `server/proxy/http.go` (+13 -2) 📝 `server/proxy/https.go` (+4 -0) 📝 `server/proxy/proxy.go` (+26 -3) 📝 `server/proxy/udp.go` (+1 -1) 📝 `server/proxy/xtcp.go` (+1 -1) _...and 14 more files_ </details> ### 📄 Description 1. Fix route conflict. 2. Support proxy protocol. 3. New plugin `https2http`. --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>