Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
dca702a5
Commit
dca702a5
authored
Jun 01, 2018
by
NLR
Committed by
Kamil Trzciński
Jun 01, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make http_io honor HTTP(S)_PROXY environment.
parent
c3450ab9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
changelogs/unreleased/fix-http-proxy.yml
changelogs/unreleased/fix-http-proxy.yml
+5
-0
lib/gitlab/ci/trace/http_io.rb
lib/gitlab/ci/trace/http_io.rb
+1
-1
No files found.
changelogs/unreleased/fix-http-proxy.yml
0 → 100644
View file @
dca702a5
---
title
:
Fixed HTTP_PROXY environment not honored when reading remote traces.
merge_request
:
19282
author
:
NLR
type
:
fixed
lib/gitlab/ci/trace/http_io.rb
View file @
dca702a5
...
@@ -148,7 +148,7 @@ module Gitlab
...
@@ -148,7 +148,7 @@ module Gitlab
def
get_chunk
def
get_chunk
unless
in_range?
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
)
http
.
request
(
request
)
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment