[PR #2791] [MERGED] use net.JoinHostPort instead of fmt.Sprintf #4625

New issue

Closed

opened 2026-05-05 14:45:39 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:45:39 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/2791
Author: @fatedier
Created: 2/9/2022
Status: ✅ Merged
Merged: 2/9/2022
Merged by: @fatedier

Base: dev ← Head: fix-2696

📝 Commits (1)

0e3f8c0 use net.JoinHostPort instead of fmt.Sprintf

📊 Changes

17 files changed (+61 additions, -49 deletions)

View changed files

📝 client/proxy/proxy.go (+6 -10)
📝 client/visitor.go (+4 -3)
📝 pkg/util/net/udp.go (+2 -1)
📝 pkg/util/net/websocket.go (+2 -2)
📝 pkg/util/tcpmux/httpconnect.go (+1 -1)
📝 pkg/util/util/http.go (+0 -11)
📝 pkg/util/util/util.go (+2 -1)
📝 pkg/util/vhost/http.go (+3 -3)
📝 server/group/tcp.go (+2 -2)
📝 server/ports/ports.go (+3 -3)
📝 server/proxy/tcp.go (+2 -1)
📝 server/proxy/udp.go (+2 -1)
📝 server/service.go (+6 -5)
📝 test/e2e/basic/client_server.go (+20 -0)
📝 test/e2e/mock/server/httpserver/server.go (+1 -2)
📝 test/e2e/mock/server/streamserver/server.go (+2 -1)
📝 test/e2e/pkg/port/port.go (+3 -2)

📄 Description

Fix #2696

_{🔄 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/2791 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 2/9/2022 **Status:** ✅ Merged **Merged:** 2/9/2022 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `fix-2696` --- ### 📝 Commits (1) - [`0e3f8c0`](https://github.com/fatedier/frp/commit/0e3f8c0da8ec53a24e9f6d804981cd3713033529) use net.JoinHostPort instead of fmt.Sprintf ### 📊 Changes **17 files changed** (+61 additions, -49 deletions) <details> <summary>View changed files</summary> 📝 `client/proxy/proxy.go` (+6 -10) 📝 `client/visitor.go` (+4 -3) 📝 `pkg/util/net/udp.go` (+2 -1) 📝 `pkg/util/net/websocket.go` (+2 -2) 📝 `pkg/util/tcpmux/httpconnect.go` (+1 -1) 📝 `pkg/util/util/http.go` (+0 -11) 📝 `pkg/util/util/util.go` (+2 -1) 📝 `pkg/util/vhost/http.go` (+3 -3) 📝 `server/group/tcp.go` (+2 -2) 📝 `server/ports/ports.go` (+3 -3) 📝 `server/proxy/tcp.go` (+2 -1) 📝 `server/proxy/udp.go` (+2 -1) 📝 `server/service.go` (+6 -5) 📝 `test/e2e/basic/client_server.go` (+20 -0) 📝 `test/e2e/mock/server/httpserver/server.go` (+1 -2) 📝 `test/e2e/mock/server/streamserver/server.go` (+2 -1) 📝 `test/e2e/pkg/port/port.go` (+3 -2) </details> ### 📄 Description Fix #2696 --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>