cy/goproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
arraykeys@gmail.com
2018-07-12 13:34:18 +08:00
parent f656773858 e208ccee18
commit c4a7f0fbb0
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/functions.go
View File

@ -25,12 +25,12 @@ import (
"strconv" "strconv"
"strings" "strings"
"time" "time"
"context"
"github.com/snail007/goproxy/utils/id" "github.com/snail007/goproxy/utils/id"
kcp "github.com/xtaci/kcp-go" kcp "github.com/xtaci/kcp-go"
"context"
) )
func IoBind(dst io.ReadWriteCloser, src io.ReadWriteCloser, fn func(err interface{}), log *logger.Logger) { func IoBind(dst io.ReadWriteCloser, src io.ReadWriteCloser, fn func(err interface{}), log *logger.Logger) {
@ -639,9 +639,7 @@ func InsertProxyHeaders(head []byte, headers string) []byte {
/* /*
net.LookupIP may cause deadlock in windows net.LookupIP may cause deadlock in windows
https://github.com/golang/go/issues/24178 https://github.com/golang/go/issues/24178
*/ */
func MyLookupIP(host string) ([]net.IP, error) { func MyLookupIP(host string) ([]net.IP, error) {
ctx ,cancel := context.WithTimeout(context.Background(),time.Second *time.Duration(3)) ctx ,cancel := context.WithTimeout(context.Background(),time.Second *time.Duration(3))