oe-git-proxy: Correct the parsing of a port in $ALL_PROXY
Due to an error in the regular expression used to extract a port number specified in $ALL_PROXY, rather than allowing the port number to be followed by an optional "/", the port was required to be followed by "/?". This corrects the regular expression to allow an optional "/". It also allows the odd "/?" suffix for backwards compatibility. (From OE-Core rev: 39eb19e2ae9add58c763b71b54bdb3739041b2d0) 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
c035f3575b
commit
18309f0893
|
@ -113,7 +113,9 @@ done
|
||||||
# Proxy is necessary, determine protocol, server, and port
|
# Proxy is necessary, determine protocol, server, and port
|
||||||
PROTO=$(echo $ALL_PROXY | sed -e 's/\([^:]*\):\/\/.*/\1/')
|
PROTO=$(echo $ALL_PROXY | sed -e 's/\([^:]*\):\/\/.*/\1/')
|
||||||
PROXY=$(echo $ALL_PROXY | sed -e 's/.*:\/\/\([^:]*\).*/\1/')
|
PROXY=$(echo $ALL_PROXY | sed -e 's/.*:\/\/\([^:]*\).*/\1/')
|
||||||
PORT=$(echo $ALL_PROXY | sed -e 's/.*:\([0-9]*\)\/?$/\1/')
|
# For backwards compatibility, this allows the port number to be followed by /?
|
||||||
|
# in addition to the customary optional /
|
||||||
|
PORT=$(echo $ALL_PROXY | sed -e 's/.*:\([0-9]*\)\(\/?\?\)\?$/\1/')
|
||||||
if [ "$PORT" = "$ALL_PROXY" ]; then
|
if [ "$PORT" = "$ALL_PROXY" ]; then
|
||||||
PORT=""
|
PORT=""
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in New Issue