diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-01 14:32:10 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-06-01 14:32:10 +0000 |
| commit | 52388feb644aae75f9f31ca71d019c1dfade3d28 (patch) | |
| tree | 30c67244fa310a85a5a4ea1fc682244696d6f364 | |
| parent | c3450ab9eec31a525e3559520b8a010ed5c2c2e8 (diff) | |
| parent | dca702a599df033acd114e1d3eea52b2c82f4001 (diff) | |
| download | gitlab-ce-52388feb644aae75f9f31ca71d019c1dfade3d28.tar.gz | |
Merge branch 'fix-http-proxy' into 'master'
Make http_io honor HTTP(S)_PROXY environment.
Closes #46968 and #46982
See merge request gitlab-org/gitlab-ce!19282
| -rw-r--r-- | changelogs/unreleased/fix-http-proxy.yml | 5 | ||||
| -rw-r--r-- | lib/gitlab/ci/trace/http_io.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changelogs/unreleased/fix-http-proxy.yml b/changelogs/unreleased/fix-http-proxy.yml new file mode 100644 index 00000000000..806b7d0a38c --- /dev/null +++ b/changelogs/unreleased/fix-http-proxy.yml @@ -0,0 +1,5 @@ +--- +title: Fixed HTTP_PROXY environment not honored when reading remote traces. +merge_request: 19282 +author: NLR +type: fixed diff --git a/lib/gitlab/ci/trace/http_io.rb b/lib/gitlab/ci/trace/http_io.rb index cff924e27ef..8788af57a67 100644 --- a/lib/gitlab/ci/trace/http_io.rb +++ b/lib/gitlab/ci/trace/http_io.rb @@ -148,7 +148,7 @@ module Gitlab def get_chunk unless in_range? - response = Net::HTTP.start(uri.hostname, uri.port, use_ssl: uri.scheme == 'https') do |http| + response = Net::HTTP.start(uri.hostname, uri.port, proxy_from_env: true, use_ssl: uri.scheme == 'https') do |http| http.request(request) end |