diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-05-09 16:01:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-09 16:01:16 -0400 |
| commit | 535eb14eeb344a64667ad18d514a93fa738b07b7 (patch) | |
| tree | 569b3cfa49a4cb577537d6cea1b9a3449a15f583 /app/login.go | |
| parent | 8c8d9dbf8fa3b4ebf640bf5e1a71f9c04b57e111 (diff) | |
| download | chat-535eb14eeb344a64667ad18d514a93fa738b07b7.tar.gz chat-535eb14eeb344a64667ad18d514a93fa738b07b7.tar.bz2 chat-535eb14eeb344a64667ad18d514a93fa738b07b7.zip | |
Get protocol correctly if using SSL direct to Mattermost (#6361)
Diffstat (limited to 'app/login.go')
| -rw-r--r-- | app/login.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/login.go b/app/login.go index 4f9284140..2528f9367 100644 --- a/app/login.go +++ b/app/login.go @@ -138,7 +138,7 @@ func DoLogin(w http.ResponseWriter, r *http.Request, user *model.User, deviceId } func GetProtocol(r *http.Request) string { - if r.Header.Get(model.HEADER_FORWARDED_PROTO) == "https" { + if r.Header.Get(model.HEADER_FORWARDED_PROTO) == "https" || r.TLS != nil { return "https" } else { return "http" |