mirror of https://github.com/tailscale/tailscale/
Merge branch 'master' of github.com:tailscale/tailscale
* 'master' of github.com:tailscale/tailscale: derp/derphttp: don't use x/net/proxy for SOCKS on iOSreviewable/pr386/r1
commit
3b1ce30967
@ -0,0 +1,20 @@
|
||||
// Copyright (c) 2020 Tailscale Inc & AUTHORS All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
// +build !ios
|
||||
|
||||
package derphttp
|
||||
|
||||
import "golang.org/x/net/proxy"
|
||||
|
||||
func init() {
|
||||
wrapDialer = wrapSocks
|
||||
}
|
||||
|
||||
func wrapSocks(d dialer) dialer {
|
||||
if cd, ok := proxy.FromEnvironmentUsing(d).(dialer); ok {
|
||||
return cd
|
||||
}
|
||||
return d
|
||||
}
|
Loading…
Reference in New Issue