summaryrefslogtreecommitdiff
path: root/src/rebar_pkg_resource.erl
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2016-12-01 11:47:24 -0500
committerFred Hebert <mononcqc@ferd.ca>2016-12-01 11:47:24 -0500
commit5f0658d8ac031e5bb7c591eda55a596b021e9c4f (patch)
treed75303ab4cbe65ebea9ee3ec7d40b0a84be72fda /src/rebar_pkg_resource.erl
parent1766bc30783894f0343e72c4170b709e28741360 (diff)
parent2c155ead23abeedb39ff761e4db5269f7b2a78ca (diff)
Merge branch 'artempervin-master'
Diffstat (limited to 'src/rebar_pkg_resource.erl')
-rw-r--r--src/rebar_pkg_resource.erl4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/rebar_pkg_resource.erl b/src/rebar_pkg_resource.erl
index 5817817..8e1713d 100644
--- a/src/rebar_pkg_resource.erl
+++ b/src/rebar_pkg_resource.erl
@@ -107,8 +107,10 @@ make_vsn(_) ->
{error, "Replacing version of type pkg not supported."}.
request(Url, ETag) ->
+ HttpOptions = [{ssl, ssl_opts(Url)}, {relaxed, true} | rebar_utils:get_proxy_auth()],
+
case httpc:request(get, {Url, [{"if-none-match", ETag} || ETag =/= false]++[{"User-Agent", rebar_utils:user_agent()}]},
- [{ssl, ssl_opts(Url)}, {relaxed, true}],
+ HttpOptions,
[{body_format, binary}],
rebar) of
{ok, {{_Version, 200, _Reason}, Headers, Body}} ->