summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2017-11-05 11:57:34 -0500
committerGitHub <noreply@github.com>2017-11-05 11:57:34 -0500
commit387b89a4cede139601cb517783e7cc97a3b917fd (patch)
tree7d8988486827728053157c2917753650269e8074
parent557623ba897d580702034bd76f799b5107d72c6b (diff)
parentcc660d717a7c4fd5d290eddf9c1b1d9772a8924e (diff)
Merge pull request #1655 from kanyukaaa/master
fixed handling of proxy username and password when fetching registry
-rw-r--r--src/rebar_prv_update.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rebar_prv_update.erl b/src/rebar_prv_update.erl
index a019c5a..79804d3 100644
--- a/src/rebar_prv_update.erl
+++ b/src/rebar_prv_update.erl
@@ -51,9 +51,10 @@ do(State) ->
CDN = rebar_state:get(State, rebar_packages_cdn, ?DEFAULT_CDN),
case rebar_utils:url_append_path(CDN, ?REMOTE_REGISTRY_FILE) of
{ok, Url} ->
+ HttpOptions = [{relaxed, true} | rebar_utils:get_proxy_auth()],
?DEBUG("Fetching registry from ~p", [Url]),
case httpc:request(get, {Url, [{"User-Agent", rebar_utils:user_agent()}]},
- [], [{stream, TmpFile}, {sync, true}],
+ HttpOptions, [{stream, TmpFile}, {sync, true}],
rebar) of
{ok, saved_to_file} ->
{ok, Data} = file:read_file(TmpFile),