[PR #740] [MERGED] frpc: support connectiong frps by socks5 proxy #4247

New issue

Closed

opened 2026-05-05 14:38:25 -06:00 by gitea-mirror · 0 comments

gitea-mirror commented

2026-05-05 14:38:25 -06:00

Owner

📋 Pull Request Information

Original PR: https://github.com/fatedier/frp/pull/740
Author: @fatedier
Created: 5/4/2018
Status: ✅ Merged
Merged: 5/4/2018
Merged by: @fatedier

Base: dev ← Head: socks5

📝 Commits (2)

30af327 frpc: support connectiong frps by socks5 proxy
cd37d22 vendor: udpate golang.org/x/net

📊 Changes

151 files changed (+23518 additions, -14750 deletions)

View changed files

📝 client/control.go (+2 -2)
📝 conf/frpc_full.ini (+2 -1)
📝 glide.lock (+5 -3)
📝 glide.yaml (+1 -1)
📝 tests/func_test.go (+1 -1)
📝 utils/net/conn.go (+2 -2)
📝 utils/net/tcp.go (+50 -14)
📝 vendor/golang.org/x/net/CONTRIBUTING.md (+5 -10)
➖ vendor/golang.org/x/net/README (+0 -3)
➕ vendor/golang.org/x/net/README.md (+16 -0)
📝 vendor/golang.org/x/net/bpf/instructions.go (+16 -16)
➕ vendor/golang.org/x/net/bpf/setter.go (+10 -0)
📝 vendor/golang.org/x/net/context/context.go (+2 -102)
➕ vendor/golang.org/x/net/context/go19.go (+20 -0)
➕ vendor/golang.org/x/net/context/pre_go19.go (+109 -0)
📝 vendor/golang.org/x/net/context/withtimeout_test.go (+7 -2)
➕ vendor/golang.org/x/net/dns/dnsmessage/example_test.go (+132 -0)
📝 vendor/golang.org/x/net/dns/dnsmessage/message.go (+1045 -216)
📝 vendor/golang.org/x/net/dns/dnsmessage/message_test.go (+994 -253)
📝 vendor/golang.org/x/net/html/atom/gen.go (+101 -37)

...and 80 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/740 **Author:** [@fatedier](https://github.com/fatedier) **Created:** 5/4/2018 **Status:** ✅ Merged **Merged:** 5/4/2018 **Merged by:** [@fatedier](https://github.com/fatedier) **Base:** `dev` ← **Head:** `socks5` --- ### 📝 Commits (2) - [`30af327`](https://github.com/fatedier/frp/commit/30af32728ab75b1f47c455aaa8e0e49fe078791a) frpc: support connectiong frps by socks5 proxy - [`cd37d22`](https://github.com/fatedier/frp/commit/cd37d22f3b58e2697ddf5a9af883011ef8099b37) vendor: udpate golang.org/x/net ### 📊 Changes **151 files changed** (+23518 additions, -14750 deletions) <details> <summary>View changed files</summary> 📝 `client/control.go` (+2 -2) 📝 `conf/frpc_full.ini` (+2 -1) 📝 `glide.lock` (+5 -3) 📝 `glide.yaml` (+1 -1) 📝 `tests/func_test.go` (+1 -1) 📝 `utils/net/conn.go` (+2 -2) 📝 `utils/net/tcp.go` (+50 -14) 📝 `vendor/golang.org/x/net/CONTRIBUTING.md` (+5 -10) ➖ `vendor/golang.org/x/net/README` (+0 -3) ➕ `vendor/golang.org/x/net/README.md` (+16 -0) 📝 `vendor/golang.org/x/net/bpf/instructions.go` (+16 -16) ➕ `vendor/golang.org/x/net/bpf/setter.go` (+10 -0) 📝 `vendor/golang.org/x/net/context/context.go` (+2 -102) ➕ `vendor/golang.org/x/net/context/go19.go` (+20 -0) ➕ `vendor/golang.org/x/net/context/pre_go19.go` (+109 -0) 📝 `vendor/golang.org/x/net/context/withtimeout_test.go` (+7 -2) ➕ `vendor/golang.org/x/net/dns/dnsmessage/example_test.go` (+132 -0) 📝 `vendor/golang.org/x/net/dns/dnsmessage/message.go` (+1045 -216) 📝 `vendor/golang.org/x/net/dns/dnsmessage/message_test.go` (+994 -253) 📝 `vendor/golang.org/x/net/html/atom/gen.go` (+101 -37) _...and 80 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>