[PR #25] [MERGED] merge dev for fixing bugs when frpc login failed #4107

New issue

Closed

opened 2026-05-05 14:35:47 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:35:47 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/25
Author: @fatedier
Created: 5/8/2016
Status: ✅ Merged
Merged: 5/8/2016
Merged by: @fatedier

Base: master ← Head: dev

📝 Commits (8)

f650d3f all: support for virtual host
14ba38a doc: update
deb7506 doc: update
0b9d823 doc: update
d7797cb doc: update
c10321e utils/log: support max days of keeping log files
d39d745 docker: rm Dockerfile
040841d cmd/frps/control: fix bug when frpc login failed

📊 Changes

18 files changed (+608 additions, -136 deletions)

View changed files

➖ Dockerfile (+0 -14)
📝 README.md (+11 -7)
📝 README_zh.md (+15 -10)
📝 conf/frpc.ini (+17 -2)
📝 conf/frps.ini (+17 -2)
📝 doc/quick_start_en.md (+75 -11)
📝 doc/quick_start_zh.md (+80 -12)
📝 src/frp/cmd/frpc/main.go (+1 -1)
📝 src/frp/cmd/frps/control.go (+6 -1)
📝 src/frp/cmd/frps/main.go (+18 -3)
📝 src/frp/models/client/client.go (+1 -0)
📝 src/frp/models/client/config.go (+16 -0)
📝 src/frp/models/server/config.go (+56 -11)
📝 src/frp/models/server/server.go (+71 -45)
📝 src/frp/utils/conn/conn.go (+23 -9)
📝 src/frp/utils/log/log.go (+7 -7)
📝 src/frp/utils/version/version.go (+1 -1)
➕ src/frp/utils/vhost/vhost.go (+193 -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/25 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 5/8/2016 **Status:** ✅ Merged **Merged:** 5/8/2016 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `master` ← **Head:** `dev` --- ### 📝 Commits (8) - [`f650d3f`](https://github.com/fatedier/frp/commit/f650d3f330d49e36df2dc5409b0559b6e7b8a647) all: support for virtual host - [`14ba38a`](https://github.com/fatedier/frp/commit/14ba38a1b41ceaad8b4705e0b156cf1facba0b92) doc: update - [`deb7506`](https://github.com/fatedier/frp/commit/deb750652f56622fb01e6308511c7815fe3960b9) doc: update - [`0b9d823`](https://github.com/fatedier/frp/commit/0b9d823168aac3c208feddd87813784ff7907253) doc: update - [`d7797cb`](https://github.com/fatedier/frp/commit/d7797cbd18d06e04ea3af4e6b976457369f533b6) doc: update - [`c10321e`](https://github.com/fatedier/frp/commit/c10321ead692d74d6c49ac64420f98544921fbe8) utils/log: support max days of keeping log files - [`d39d745`](https://github.com/fatedier/frp/commit/d39d745e43c0ba7ae3145aad3ba9563167e13c25) docker: rm Dockerfile - [`040841d`](https://github.com/fatedier/frp/commit/040841db483f13622c78a535e2990fed6d7dd09b) cmd/frps/control: fix bug when frpc login failed ### 📊 Changes **18 files changed** (+608 additions, -136 deletions) <details> <summary>View changed files</summary> ➖ `Dockerfile` (+0 -14) 📝 `README.md` (+11 -7) 📝 `README_zh.md` (+15 -10) 📝 `conf/frpc.ini` (+17 -2) 📝 `conf/frps.ini` (+17 -2) 📝 `doc/quick_start_en.md` (+75 -11) 📝 `doc/quick_start_zh.md` (+80 -12) 📝 `src/frp/cmd/frpc/main.go` (+1 -1) 📝 `src/frp/cmd/frps/control.go` (+6 -1) 📝 `src/frp/cmd/frps/main.go` (+18 -3) 📝 `src/frp/models/client/client.go` (+1 -0) 📝 `src/frp/models/client/config.go` (+16 -0) 📝 `src/frp/models/server/config.go` (+56 -11) 📝 `src/frp/models/server/server.go` (+71 -45) 📝 `src/frp/utils/conn/conn.go` (+23 -9) 📝 `src/frp/utils/log/log.go` (+7 -7) 📝 `src/frp/utils/version/version.go` (+1 -1) ➕ `src/frp/utils/vhost/vhost.go` (+193 -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>