Fix using HTTP proxy.
/trunk/scripts/crosstool.sh | 9 5 4 0 +++++----
/trunk/config/global/download_extract.in | 2 1 1 0 +-
2 files changed, 6 insertions(+), 5 deletions(-)
1.1 --- a/config/global/download_extract.in Thu Apr 17 21:07:01 2008 +0000
1.2 +++ b/config/global/download_extract.in Fri Apr 18 08:41:30 2008 +0000
1.3 @@ -136,7 +136,7 @@
1.4 config PROXY_TYPE
1.5 string
1.6 default "none" if PROXY_TYPE_NONE
1.7 - default "HTTP" if PROXY_TYPE_HTTP
1.8 + default "http" if PROXY_TYPE_HTTP
1.9 default "socks5" if PROXY_TYPE_SOCKS_5
1.10 default "socks4" if PROXY_TYPE_SOCKS_4
1.11
2.1 --- a/scripts/crosstool.sh Thu Apr 17 21:07:01 2008 +0000
2.2 +++ b/scripts/crosstool.sh Fri Apr 18 08:41:30 2008 +0000
2.3 @@ -215,13 +215,14 @@
2.4 http_proxy="http://"
2.5 case "${CT_PROXY_USER}:${CT_PROXY_PASS}" in
2.6 :) ;;
2.7 - :*) http_proxy="${http_proxy}:${CT_HTP_PROXY_PASS}@";;
2.8 - *:) http_proxy="${http_proxy}${CT_HTTP_PROXY_USER}@";;
2.9 - *:*) http_proxy="${http_proxy}${CT_HTTP_PROXY_USER}:${CT_HTP_PROXY_PASS}@";;
2.10 + :*) http_proxy="${http_proxy}:${CT_PROXY_PASS}@";;
2.11 + *:) http_proxy="${http_proxy}${CT_PROXY_USER}@";;
2.12 + *:*) http_proxy="${http_proxy}${CT_PROXY_USER}:${CT_PROXY_PASS}@";;
2.13 esac
2.14 - export http_proxy="${http_proxy}${HTTP_PROXY_HOST}:${HTTP_PROXY_PORT}/"
2.15 + export http_proxy="${http_proxy}${CT_PROXY_HOST}:${CT_PROXY_PORT}/"
2.16 export https_proxy="${http_proxy}"
2.17 export ftp_proxy="${http_proxy}"
2.18 + CT_DoLog DEBUG "http_proxy='${http_proxy}'"
2.19 ;;
2.20 socks?)
2.21 # Re;ove any lingering config file from any previous run