oe-git-proxy: Allow socks4 as protocol in $ALL_PROXY
The current default is to use SOCKS4a when socks is specified as protocol in $ALL_PROXY. However, not all socks servers support SOCKS4a. By allowing socks4 as an additional protocol, this script will happily work with SOCKS4 only servers. (From OE-Core rev: da9ddf48ed4a13cdc47649e22ab6ef7e36e01fdf) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
18309f0893
commit
f32a6e1f59
|
@ -120,11 +120,16 @@ if [ "$PORT" = "$ALL_PROXY" ]; then
|
||||||
PORT=""
|
PORT=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ "$PROTO" = "socks" ]; then
|
if [ "$PROTO" = "socks" ] || [ "$PROTO" = "socks4a" ]; then
|
||||||
if [ -z "$PORT" ]; then
|
if [ -z "$PORT" ]; then
|
||||||
PORT="1080"
|
PORT="1080"
|
||||||
fi
|
fi
|
||||||
METHOD="SOCKS4A:$PROXY:$1:$2,socksport=$PORT"
|
METHOD="SOCKS4A:$PROXY:$1:$2,socksport=$PORT"
|
||||||
|
elif [ "$PROTO" = "socks4" ]; then
|
||||||
|
if [ -z "$PORT" ]; then
|
||||||
|
PORT="1080"
|
||||||
|
fi
|
||||||
|
METHOD="SOCKS4:$PROXY:$1:$2,socksport=$PORT"
|
||||||
else
|
else
|
||||||
# Assume PROXY (http, https, etc)
|
# Assume PROXY (http, https, etc)
|
||||||
if [ -z "$PORT" ]; then
|
if [ -z "$PORT" ]; then
|
||||||
|
|
Loading…
Reference in New Issue