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

Merge branch 'dev' into dev

Browse Source
This commit is contained in:
boboanvip
2018-07-12 10:28:32 +08:00
committed by GitHub
parent 907dec42e0 8dce99fec6
commit 61f791e77d
7 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk/android-ios/release_android.sh
View File

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

2
sdk/android-ios/release_ios.sh
View File

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

2
sdk/android-ios/sdk.go
View File

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

2
sdk/windows-linux/release_linux.sh
View File

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

2
sdk/windows-linux/release_mac.sh
View File

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

10
sdk/windows-linux/release_windows.sh
View File

@ -1,8 +1,8 @@
#/bin/bash #/bin/bash
VER="v5.0" VER="v5.2"
sudo rm /usr/local/go #sudo rm /usr/local/go
sudo ln -s /usr/local/go1.10.1 /usr/local/go #sudo ln -s /usr/local/go1.10.1 /usr/local/go
rm -rf sdk-windows-*.tar.gz rm -rf sdk-windows-*.tar.gz
rm -rf README.md proxy-sdk.h proxy-sdk.dll 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 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 rm -rf README.md proxy-sdk.h proxy-sdk.dll
sudo rm /usr/local/go #sudo rm /usr/local/go
sudo ln -s /usr/local/go1.8.5 /usr/local/go #sudo ln -s /usr/local/go1.8.5 /usr/local/go
echo "done." echo "done."

3
utils/functions.go
View File

@ -30,6 +30,8 @@ import (
"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,7 +641,6 @@ 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))