[PR #4720] [CLOSED] Merge master #5033

New issue

Closed

opened 2026-05-05 14:53:24 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:53:24 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/4720
Author: @lidsid
Created: 3/19/2025
Status: ❌ Closed

Base: dev ← Head: Merge-master

📝 Commits (10+)

6451583 Merge pull request #1349 from fatedier/dev
ae08811 Merge pull request #1364 from fatedier/dev
134a46c Merge pull request #1369 from fatedier/dev
e62d9a5 Merge pull request #1415 from fatedier/dev
adc3adc Merge pull request #1494 from fatedier/dev
75f3bce Merge pull request #1542 from fatedier/dev
30c246c Merge pull request #1588 from fatedier/dev
f480160 Merge pull request #1596 from fatedier/dev
487c8d7 Merge pull request #1637 from fatedier/dev
23bb763 Merge pull request #1696 from fatedier/dev

📊 Changes

22 files changed (+591 additions, -18 deletions)

View changed files

➕ README_agi7.md (+9 -0)
📝 client/control.go (+19 -1)
📝 client/proxy/xtcp.go (+1 -1)
📝 client/service.go (+1 -1)
📝 go.mod (+2 -0)
📝 go.sum (+1 -0)
📝 pkg/auth/auth.go (+4 -0)
➕ pkg/auth/jwt.go (+128 -0)
📝 pkg/config/v1/client.go (+2 -0)
📝 pkg/config/v1/common.go (+1 -0)
📝 pkg/config/v1/server.go (+1 -0)
📝 pkg/config/v1/validation/validation.go (+1 -0)
📝 pkg/msg/handler.go (+3 -0)
📝 pkg/msg/msg.go (+8 -1)
📝 pkg/util/vhost/http.go (+7 -0)
📝 pkg/util/vhost/router.go (+19 -0)
📝 server/control.go (+20 -2)
📝 server/dashboard_api.go (+116 -0)
📝 server/proxy/http.go (+6 -1)
📝 server/proxy/proxy.go (+5 -1)

...and 2 more files

📄 Description

WHY

_{🔄 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/4720 **Author:** [@lidsid](https://github.com/lidsid) **Created:** 3/19/2025 **Status:** ❌ Closed **Base:** `dev` ← **Head:** `Merge-master` --- ### 📝 Commits (10+) - [`6451583`](https://github.com/fatedier/frp/commit/6451583e60184a90c274f6683a44e89fb7a9118e) Merge pull request #1349 from fatedier/dev - [`ae08811`](https://github.com/fatedier/frp/commit/ae08811636f6ab449deb30cf7579390f9d476ab3) Merge pull request #1364 from fatedier/dev - [`134a46c`](https://github.com/fatedier/frp/commit/134a46c00b59a641dc89ab9265ea73d2d7aa6ff2) Merge pull request #1369 from fatedier/dev - [`e62d9a5`](https://github.com/fatedier/frp/commit/e62d9a52429f54dee8df1c42f2d4bad7a267b05d) Merge pull request #1415 from fatedier/dev - [`adc3adc`](https://github.com/fatedier/frp/commit/adc3adc13bf3a2bc43354377b842944f9cfc6a25) Merge pull request #1494 from fatedier/dev - [`75f3bce`](https://github.com/fatedier/frp/commit/75f3bce04dad71213fbf63da2dd6000a22e2c431) Merge pull request #1542 from fatedier/dev - [`30c246c`](https://github.com/fatedier/frp/commit/30c246c48889140402943f5aebb04c89b031c708) Merge pull request #1588 from fatedier/dev - [`f480160`](https://github.com/fatedier/frp/commit/f480160e2d22b9bbca2590660b50d69a1c5059bc) Merge pull request #1596 from fatedier/dev - [`487c8d7`](https://github.com/fatedier/frp/commit/487c8d7c29b3bbedbd0351029c480d30a7c2d880) Merge pull request #1637 from fatedier/dev - [`23bb763`](https://github.com/fatedier/frp/commit/23bb76397a0484485a16e1a3e990385b13ee388d) Merge pull request #1696 from fatedier/dev ### 📊 Changes **22 files changed** (+591 additions, -18 deletions) <details> <summary>View changed files</summary> ➕ `README_agi7.md` (+9 -0) 📝 `client/control.go` (+19 -1) 📝 `client/proxy/xtcp.go` (+1 -1) 📝 `client/service.go` (+1 -1) 📝 `go.mod` (+2 -0) 📝 `go.sum` (+1 -0) 📝 `pkg/auth/auth.go` (+4 -0) ➕ `pkg/auth/jwt.go` (+128 -0) 📝 `pkg/config/v1/client.go` (+2 -0) 📝 `pkg/config/v1/common.go` (+1 -0) 📝 `pkg/config/v1/server.go` (+1 -0) 📝 `pkg/config/v1/validation/validation.go` (+1 -0) 📝 `pkg/msg/handler.go` (+3 -0) 📝 `pkg/msg/msg.go` (+8 -1) 📝 `pkg/util/vhost/http.go` (+7 -0) 📝 `pkg/util/vhost/router.go` (+19 -0) 📝 `server/control.go` (+20 -2) 📝 `server/dashboard_api.go` (+116 -0) 📝 `server/proxy/http.go` (+6 -1) 📝 `server/proxy/proxy.go` (+5 -1) _...and 2 more files_ </details> ### 📄 Description ### WHY  --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>