diff options
| author | Torsten Juergeleit <torsten.juergeleit@gmail.com> | 2017-05-31 16:34:05 +0200 |
|---|---|---|
| committer | Harrison Healey <harrisonmhealey@gmail.com> | 2017-05-31 10:34:05 -0400 |
| commit | fdf1164aee36d60b34ca82c07fe02b68e972f53a (patch) | |
| tree | decf173e9b6fb8d8f3c10463d065ad9234fc3391 /app/webrtc.go | |
| parent | ddc996f33fc39b2b8f4705d6e1232ccbad1ee4c7 (diff) | |
| download | chat-fdf1164aee36d60b34ca82c07fe02b68e972f53a.tar.gz chat-fdf1164aee36d60b34ca82c07fe02b68e972f53a.tar.bz2 chat-fdf1164aee36d60b34ca82c07fe02b68e972f53a.zip | |
PLT-5705 Created a single source of http.Client creation logic with internet proxy support, reasonable timeouts and optional insecure connections (#6503)
Diffstat (limited to 'app/webrtc.go')
| -rw-r--r-- | app/webrtc.go | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/app/webrtc.go b/app/webrtc.go index 6692fff60..4d44234a8 100644 --- a/app/webrtc.go +++ b/app/webrtc.go @@ -6,7 +6,6 @@ package app import ( "crypto/hmac" "crypto/sha1" - "crypto/tls" "encoding/base64" "net/http" "strconv" @@ -60,11 +59,7 @@ func GetWebrtcToken(sessionId string) (string, *model.AppError) { rq, _ := http.NewRequest("POST", *utils.Cfg.WebrtcSettings.GatewayAdminUrl, strings.NewReader(model.MapToJson(data))) rq.Header.Set("Content-Type", "application/json") - tr := &http.Transport{ - TLSClientConfig: &tls.Config{InsecureSkipVerify: *utils.Cfg.ServiceSettings.EnableInsecureOutgoingConnections}, - } - httpClient := &http.Client{Transport: tr} - if rp, err := httpClient.Do(rq); err != nil { + if rp, err := utils.HttpClient().Do(rq); err != nil { return "", model.NewAppError("WebRTC.Token", "model.client.connecting.app_error", nil, err.Error(), http.StatusInternalServerError) } else if rp.StatusCode >= 300 { defer CloseBody(rp) |