Merge branch 'dev' into dev

sdk/android-ios/release_android.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-VER="v5.0"
+VER="v5.2"
 rm -rf sdk-android-*.tar.gz
 rm -rf android
 mkdir android

sdk/android-ios/release_ios.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-VER="v5.0"
+VER="v5.2"
 rm -rf sdk-ios-*.tar.gz
 rm -rf ios
 mkdir ios

sdk/android-ios/sdk.go

@@ -23,7 +23,7 @@ import (
 	kingpin "gopkg.in/alecthomas/kingpin.v2"
 )
 
-const SDK_VERSION = "5.0"
+const SDK_VERSION = "5.2"
 
 var (
 	app *kingpin.Application

sdk/windows-linux/release_linux.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-VER="v5.0"
+VER="v5.2"
 
 rm -rf sdk-linux-*.tar.gz
 rm -rf README.md libproxy-sdk.so libproxy-sdk.h libproxy-sdk.a

sdk/windows-linux/release_mac.sh

@@ -1,5 +1,5 @@
 #/bin/bash
-VER="v5.0"
+VER="v5.2"
 
 rm -rf *.tar.gz
 rm -rf README.md libproxy-sdk.dylib libproxy-sdk.h

sdk/windows-linux/release_windows.sh

@@ -1,8 +1,8 @@
 #/bin/bash
-VER="v5.0"
+VER="v5.2"
 
-sudo rm /usr/local/go
-sudo ln -s /usr/local/go1.10.1 /usr/local/go
+#sudo rm /usr/local/go
+#sudo ln -s /usr/local/go1.10.1 /usr/local/go
 rm -rf sdk-windows-*.tar.gz
 rm -rf README.md proxy-sdk.h proxy-sdk.dll
 
@@ -22,7 +22,7 @@ cp ../README.md .
 tar zcf sdk-windows-32bit-${VER}.tar.gz README.md proxy-sdk.dll proxy-sdk.h ieshims.dll
 rm -rf README.md proxy-sdk.h proxy-sdk.dll
 
-sudo rm /usr/local/go
-sudo ln -s /usr/local/go1.8.5 /usr/local/go
+#sudo rm /usr/local/go
+#sudo ln -s /usr/local/go1.8.5 /usr/local/go
 
 echo "done."

utils/functions.go

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