lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-07-26 11:44:22 -04:00
Code Issues Releases Wiki Activity

Merge pull request #1301 from felixonmars/devendor-socks

Browse Source 
Use h12.io/socks instead of vendored old one
This commit is contained in:
Victoria Raymond 2018-10-06 13:46:08 +02:00 committed by GitHub
commit 35557cc175
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -1,3 +0,0 @@
[submodule "vendor/h12.me/socks"]
path = vendor/h12.me/socks
url = https://github.com/h12w/socks

2
testing/scenarios/socks_test.go
View File

@ -6,7 +6,7 @@ import (
"v2ray.com/core/app/router" "v2ray.com/core/app/router"
xproxy "golang.org/x/net/proxy" xproxy "golang.org/x/net/proxy"
socks4 "h12.me/socks" socks4 "h12.io/socks"
"v2ray.com/core" "v2ray.com/core"
"v2ray.com/core/app/proxyman" "v2ray.com/core/app/proxyman"
"v2ray.com/core/common/net" "v2ray.com/core/common/net"

1
vendor/h12.me/socks generated vendored

@ -1 +0,0 @@
Subproject commit fa8c79229fbda5e9996dd91341b9fc023aa5d33a