Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Open sidebar
Web - Open
Gitlab Runner
Commits
35afcf65
Unverified
Commit
35afcf65
authored
Jan 22, 2018
by
Alessio Caiazza
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch '10-3-stable-patch-1' into 10-3-stable
parents
5cf5e19a
1c7e3124
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
2 deletions
+11
-2
CHANGELOG.md
CHANGELOG.md
+3
-0
VERSION
VERSION
+1
-1
network/client.go
network/client.go
+7
-1
No files found.
CHANGELOG.md
View file @
35afcf65
v 10.3.1 (2018-01-22)
-
Always load OS certificate pool when evaluating TLS connections !804
v 10.3.0 (2017-12-22)
-
Do not use
`git config --local`
as it's not available in git v1.7.1 !790
-
new RC naming schema !780
...
...
VERSION
View file @
35afcf65
10.3.
0
10.3.
1
network/client.go
View file @
35afcf65
...
...
@@ -107,7 +107,13 @@ func (n *client) addTLSCA(tlsConfig *tls.Config) {
data
,
err
:=
ioutil
.
ReadFile
(
file
)
if
err
==
nil
{
pool
:=
x509
.
NewCertPool
()
pool
,
err
:=
x509
.
SystemCertPool
()
if
err
!=
nil
{
logrus
.
Warningln
(
"Failed to load system CertPool:"
,
err
)
}
if
pool
==
nil
{
pool
=
x509
.
NewCertPool
()
}
if
pool
.
AppendCertsFromPEM
(
data
)
{
tlsConfig
.
RootCAs
=
pool
n
.
caData
=
data
...
...
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